diff --git a/README.md b/README.md
index 2c33119e34305cbbfa114842e2589ddf87417100..0e1adcd97c61265ec0ad272043c9604736545b3d 100644
--- a/README.md
+++ b/README.md
@@ -131,10 +131,10 @@ cmake .. -DCPUTYPE=mips64 && cmake --build .
 ### On Windows platform
 
 If you use the Visual Studio 2013, please open a command window by executing "cmd.exe".
-Please specify "x86_amd64" for 64 bits Windows or specify "x86" is for 32 bits Windows when you execute vcvarsall.bat.
+Please specify "amd64" for 64 bits Windows or specify "x86" is for 32 bits Windows when you execute vcvarsall.bat.
 ```cmd
 mkdir debug && cd debug
-"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" < x86_amd64 | x86 >
+"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" < amd64 | x86 >
 cmake .. -G "NMake Makefiles"
 nmake
 ```
diff --git a/cmake/define.inc b/cmake/define.inc
index cc8bd0fc355847354b23453d2329bda88bfaa2b7..a15e0aecbb2d30ad2ec7aa1c5761c9d2a40f3323 100755
--- a/cmake/define.inc
+++ b/cmake/define.inc
@@ -122,10 +122,14 @@ IF (TD_LINUX)
     ADD_DEFINITIONS(-D_TD_NINGSI_60)
     MESSAGE(STATUS "set ningsi macro to true")
   ENDIF ()
-  
-  SET(DEBUG_FLAGS "-O0 -g3 -DDEBUG")
+
+  IF (TD_MEMORY_SANITIZER)
+    SET(DEBUG_FLAGS "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment -static-libasan -O0 -g3 -DDEBUG")
+  ELSE ()
+    SET(DEBUG_FLAGS "-O0 -g3 -DDEBUG")
+  ENDIF ()
   SET(RELEASE_FLAGS "-O3 -Wno-error")
-  
+
   IF (${COVER} MATCHES "true")
     MESSAGE(STATUS "Test coverage mode, add extra flags")
     SET(GCC_COVERAGE_COMPILE_FLAGS "-fprofile-arcs -ftest-coverage")
@@ -144,7 +148,11 @@ IF (TD_DARWIN_64)
   ADD_DEFINITIONS(-DUSE_LIBICONV)
   MESSAGE(STATUS "darwin64 is defined")
   SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -Wno-missing-braces -fPIC -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
-  SET(DEBUG_FLAGS "-O0 -g3 -DDEBUG")
+  IF (TD_MEMORY_SANITIZER)
+    SET(DEBUG_FLAGS "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment -O0 -g3 -DDEBUG")
+  ELSE ()
+    SET(DEBUG_FLAGS "-O0 -g3 -DDEBUG")
+  ENDIF ()
   SET(RELEASE_FLAGS "-Og")
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/cJson/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/lz4/inc)
@@ -162,7 +170,14 @@ IF (TD_WINDOWS)
     IF (MSVC AND (MSVC_VERSION GREATER_EQUAL 1900))
       SET(COMMON_FLAGS "${COMMON_FLAGS} /Wv:18")
     ENDIF ()
-    SET(DEBUG_FLAGS "/fsanitize=thread /fsanitize=leak /fsanitize=memory /fsanitize=undefined /fsanitize=hwaddress /Zi /W3 /GL")
+
+    IF (TD_MEMORY_SANITIZER)
+      MESSAGE("memory sanitizer detected as true")
+      SET(DEBUG_FLAGS "/fsanitize=address /Zi /W3 /GL")
+    ELSE ()
+      MESSAGE("memory sanitizer detected as false")
+      SET(DEBUG_FLAGS "/Zi /W3 /GL")
+    ENDIF ()
     SET(RELEASE_FLAGS "/W0 /O3 /GL")
   ENDIF ()
 
@@ -171,7 +186,7 @@ IF (TD_WINDOWS)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/regex)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/wepoll/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/MsvcLibX/include)
-ENDIF () 
+ENDIF ()
 
 IF (TD_WINDOWS_64)
   ADD_DEFINITIONS(-D_M_X64)
diff --git a/cmake/input.inc b/cmake/input.inc
index 9b72a35d940ba5e3d79458bbe2455b0db2b59e14..c073bbbc037d105dbacea1e14981537cd31b7202 100755
--- a/cmake/input.inc
+++ b/cmake/input.inc
@@ -83,3 +83,8 @@ SET(TD_BUILD_JDBC TRUE)
 IF (${BUILD_JDBC} MATCHES "false")
   SET(TD_BUILD_JDBC FALSE)
 ENDIF ()
+
+SET(TD_MEMORY_SANITIZER FALSE)
+IF (${MEMORY_SANITIZER} MATCHES "true")
+  SET(TD_MEMORY_SANITIZER TRUE)
+ENDIF ()
diff --git a/documentation20/cn/00.index/docs.md b/documentation20/cn/00.index/docs.md
index 50b31a55d392e3d21769006b62ce52681db0d60f..49cfa12119a9e7bab1926a9ccb959f96d43dba9c 100644
--- a/documentation20/cn/00.index/docs.md
+++ b/documentation20/cn/00.index/docs.md
@@ -15,6 +15,7 @@ TDengine是一个高效的存储、查询、分析时序大数据的平台，专
 * [命令行程序TAOS](/getting-started#console)：访问TDengine的简便方式
 * [极速体验](/getting-started#demo)：运行示例程序，快速体验高效的数据插入、查询
 * [支持平台列表](/getting-started#platforms)：TDengine服务器和客户端支持的平台列表
+* [Kubernetes部署](https://taosdata.github.io/TDengine-Operator/zh/index.html)：TDengine在Kubernetes环境进行部署的详细说明
 
 ## [整体架构](/architecture)
 
diff --git a/documentation20/cn/03.architecture/docs.md b/documentation20/cn/03.architecture/docs.md
index 2668967102986952793cd0f000f32ae4cc5e1125..d22855198abc804d6cee5603b56537c9315d610e 100644
--- a/documentation20/cn/03.architecture/docs.md
+++ b/documentation20/cn/03.architecture/docs.md
@@ -176,7 +176,7 @@ TDengine 分布式架构的逻辑结构图如下：
 
 **通讯方式：**TDengine系统的各个数据节点之间，以及应用驱动与各数据节点之间的通讯是通过TCP/UDP进行的。因为考虑到物联网场景，数据写入的包一般不大，因此TDengine 除采用TCP做传输之外，还采用UDP方式，因为UDP 更加高效，而且不受连接数的限制。TDengine实现了自己的超时、重传、确认等机制，以确保UDP的可靠传输。对于数据量不到15K的数据包，采取UDP的方式进行传输，超过15K的，或者是查询类的操作，自动采取TCP的方式进行传输。同时，TDengine根据配置和数据包，会自动对数据进行压缩/解压缩，数字签名/认证等处理。对于数据节点之间的数据复制，只采用TCP方式进行数据传输。
 
-**FQDN配置**：一个数据节点有一个或多个FQDN，可以在系统配置文件taos.cfg通过参数“fqdn"进行指定，如果没有指定，系统将自动获取计算机的hostname作为其FQDN。如果节点没有配置FQDN，可以直接将该节点的配置参数fqdn设置为它的IP地址。但不建议使用IP，因为IP地址可变，一旦变化，将让集群无法正常工作。一个数据节点的EP(End Point)由FQDN + Port组成。采用FQDN，需要保证DNS服务正常工作，或者在节点以及应用所在的节点配置好hosts文件。
+**FQDN配置**：一个数据节点有一个或多个FQDN，可以在系统配置文件taos.cfg通过参数“fqdn"进行指定，如果没有指定，系统将自动获取计算机的hostname作为其FQDN。如果节点没有配置FQDN，可以直接将该节点的配置参数fqdn设置为它的IP地址。但不建议使用IP，因为IP地址可变，一旦变化，将让集群无法正常工作。一个数据节点的EP(End Point)由FQDN + Port组成。采用FQDN，需要保证DNS服务正常工作，或者在节点以及应用所在的节点配置好hosts文件。另外，这个参数值的长度需要控制在 96 个字符以内。
 
 **端口配置：**一个数据节点对外的端口由TDengine的系统配置参数serverPort决定，对集群内部通讯的端口是serverPort+5。集群内数据节点之间的数据复制操作还占有一个TCP端口，是serverPort+10. 为支持多线程高效的处理UDP数据，每个对内和对外的UDP连接，都需要占用5个连续的端口。因此一个数据节点总的端口范围为serverPort到serverPort + 10，总共11个TCP/UDP端口。（另外还可能有 RESTful、Arbitrator 所使用的端口，那样的话就一共是 13 个。）使用时，需要确保防火墙将这些端口打开，以备使用。每个数据节点可以配置不同的serverPort。（详细的端口情况请参见 [TDengine 2.0 端口说明](https://www.taosdata.com/cn/documentation/faq#port)）
 
diff --git a/documentation20/cn/08.connector/01.java/docs.md b/documentation20/cn/08.connector/01.java/docs.md
index ffea252c86b5b3eab41e93685e04dfcccccec879..e6d214c74d3367d814e0022d4c6a147c4a44b326 100644
--- a/documentation20/cn/08.connector/01.java/docs.md
+++ b/documentation20/cn/08.connector/01.java/docs.md
@@ -325,10 +325,12 @@ for (int i = 0; i < numOfRows; i++){
 }
 s.setString(2, s2, 10);
 
-// AddBatch 之后，可以再设定新的表名、TAGS、VALUES 取值，这样就能实现一次执行向多个数据表写入：
+// AddBatch 之后，缓存并未清空。为避免混乱，并不推荐在 ExecuteBatch 之前再次绑定新一批的数据：
 s.columnDataAddBatch();
-// 执行语句：
+// 执行绑定数据后的语句：
 s.columnDataExecuteBatch();
+// 执行语句后清空缓存。在清空之后，可以复用当前的对象，绑定新的一批数据（可以是新表名、新 TAGS 值、新 VALUES 值）：
+s.columnDataClearBatch();
 // 执行完毕，释放资源：
 s.columnDataCloseBatch();
 ```
diff --git a/documentation20/cn/08.connector/docs.md b/documentation20/cn/08.connector/docs.md
index b6125e3cfea180007bc784868d7be6e9d3747244..991c3ce6cea887bb7ab1bb7525afa5a549276e76 100644
--- a/documentation20/cn/08.connector/docs.md
+++ b/documentation20/cn/08.connector/docs.md
@@ -307,6 +307,8 @@ TDengine的异步API均采用非阻塞调用模式。应用程序可以用多线
 8. 调用 `taos_stmt_execute` 执行已经准备好的批处理指令；
 9. 执行完毕，调用 `taos_stmt_close` 释放所有资源。
 
+说明：如果 `taos_stmt_execute` 执行成功，假如不需要改变 SQL 语句的话，那么是可以复用 `taos_stmt_prepare` 的解析结果，直接进行第 3～6 步绑定新数据的。但如果执行出错，那么并不建议继续在当前的环境上下文下继续工作，而是建议释放资源，然后从 `taos_stmt_init` 步骤重新开始。
+
 除 C/C++ 语言外，TDengine 的 Java 语言 JNI Connector 也提供参数绑定接口支持，具体请另外参见：[参数绑定接口的 Java 用法](https://www.taosdata.com/cn/documentation/connector/java#stmt-java)。
 
 接口相关的具体函数如下（也可以参考 [apitest.c](https://github.com/taosdata/TDengine/blob/develop/tests/examples/c/apitest.c) 文件中使用对应函数的方式）：
@@ -378,6 +380,11 @@ typedef struct TAOS_MULTI_BIND {
 
   执行完毕，释放所有资源。
 
+- `char * taos_stmt_errstr(TAOS_STMT *stmt)`
+
+  （2.1.3.0 版本新增）  
+  用于在其他 stmt API 返回错误（返回错误码或空指针）时获取错误信息。
+
 ### 连续查询接口
 
 TDengine提供时间驱动的实时流式计算API。可以每隔一指定的时间段，对一张或多张数据库的表(数据流)进行各种实时聚合计算操作。操作简单，仅有打开、关闭流的API。具体如下： 
@@ -892,7 +899,7 @@ go env -w GOPROXY=https://goproxy.io,direct
 
 Node.js连接器支持的系统有：
 
-| **CPU类型**  | x64（64bit） |          |          | aarch64  | aarch32  |
+|**CPU类型**  | x64（64bit） |          |          | aarch64  | aarch32  |
 | ------------ | ------------ | -------- | -------- | -------- | -------- |
 | **OS类型**   | Linux        | Win64    | Win32    | Linux    | Linux    |
 | **支持与否** | **支持**     | **支持** | **支持** | **支持** | **支持** |
diff --git a/documentation20/cn/11.administrator/docs.md b/documentation20/cn/11.administrator/docs.md
index ee2f34ff11ef5e69195c01d0b605383c3257f48c..9e1f627709c3ad2e45e618b6f2b91ab2e80c1f10 100644
--- a/documentation20/cn/11.administrator/docs.md
+++ b/documentation20/cn/11.administrator/docs.md
@@ -99,7 +99,7 @@ taosd -C
 下面仅仅列出一些重要的配置参数，更多的参数请看配置文件里的说明。各个参数的详细介绍及作用请看前述章节，而且这些参数的缺省配置都是工作的，一般无需设置。**注意：配置修改后，需要重启*taosd*服务才能生效。**
 
 - firstEp: taosd启动时，主动连接的集群中首个dnode的end point, 默认值为localhost:6030。
-- fqdn：数据节点的FQDN，缺省为操作系统配置的第一个hostname。如果习惯IP地址访问，可设置为该节点的IP地址。
+- fqdn：数据节点的FQDN，缺省为操作系统配置的第一个hostname。如果习惯IP地址访问，可设置为该节点的IP地址。这个参数值的长度需要控制在 96 个字符以内。
 - serverPort：taosd启动后，对外服务的端口号，默认值为6030。（RESTful服务使用的端口号是在此基础上+11，即默认值为6041。）
 - dataDir: 数据文件目录，所有的数据文件都将写入该目录。默认值：/var/lib/taos。
 - logDir：日志文件目录，客户端和服务器的运行日志文件将写入该目录。默认值：/var/log/taos。
@@ -444,7 +444,7 @@ TDengine的所有可执行文件默认存放在 _/usr/local/taos/bin_ 目录下
 - 数据库名：不能包含“.”以及特殊字符，不能超过 32 个字符
 - 表名：不能包含“.”以及特殊字符，与所属数据库名一起，不能超过 192 个字符
 - 表的列名：不能包含特殊字符，不能超过 64 个字符
-- 数据库名、表名、列名，都不能以数字开头
+- 数据库名、表名、列名，都不能以数字开头，合法的可用字符集是“英文字符、数字和下划线”
 - 表的列数：不能超过 1024 列
 - 记录的最大长度：包括时间戳 8 byte，不能超过 16KB（每个 BINARY/NCHAR 类型的列还会额外占用 2 个 byte 的存储位置）
 - 单条 SQL 语句默认最大字符串长度：65480 byte
diff --git a/documentation20/cn/12.taos-sql/docs.md b/documentation20/cn/12.taos-sql/docs.md
index acb0ee803c2495859a0ef35129cfd1b08522b891..7508bbf86f0f5cda776e0f48e0512f433ae26c12 100644
--- a/documentation20/cn/12.taos-sql/docs.md
+++ b/documentation20/cn/12.taos-sql/docs.md
@@ -681,9 +681,10 @@ Query OK, 1 row(s) in set (0.001091s)
 | %               | match with any char sequences | **`binary`** **`nchar`**              |
 | _               | match with a single char      | **`binary`** **`nchar`**              |
 
-1. 同时进行多个字段的范围过滤，需要使用关键词 AND 来连接不同的查询条件，暂不支持 OR 连接的不同列之间的查询过滤条件。
-2. 针对单一字段的过滤，如果是时间过滤条件，则一条语句中只支持设定一个；但针对其他的（普通）列或标签列，则可以使用 `OR` 关键字进行组合条件的查询过滤。例如：((value > 20 AND value < 30) OR (value < 12)) 。
-3. 从 2.0.17 版本开始，条件过滤开始支持 BETWEEN AND 语法，例如 `WHERE col2 BETWEEN 1.5 AND 3.25` 表示查询条件为“1.5 ≤ col2 ≤ 3.25”。
+1. <> 算子也可以写为 != ，请注意，这个算子不能用于数据表第一列的 timestamp 字段。
+2. 同时进行多个字段的范围过滤，需要使用关键词 AND 来连接不同的查询条件，暂不支持 OR 连接的不同列之间的查询过滤条件。
+3. 针对单一字段的过滤，如果是时间过滤条件，则一条语句中只支持设定一个；但针对其他的（普通）列或标签列，则可以使用 `OR` 关键字进行组合条件的查询过滤。例如：((value > 20 AND value < 30) OR (value < 12)) 。
+4. 从 2.0.17 版本开始，条件过滤开始支持 BETWEEN AND 语法，例如 `WHERE col2 BETWEEN 1.5 AND 3.25` 表示查询条件为“1.5 ≤ col2 ≤ 3.25”。
 
 <!-- 
 <a class="anchor" id="having"></a>
@@ -1178,9 +1179,9 @@ TDengine支持针对数据的聚合查询。提供支持的聚合和选择函数
 
     应用字段：不能应用在timestamp、binary、nchar、bool类型字段。
 
-    适用于：**表**。
+    适用于：**表、（超级表）**。
 
-    说明：输出结果行数是范围内总行数减一，第一行没有结果输出。
+    说明：输出结果行数是范围内总行数减一，第一行没有结果输出。从 2.1.3.0 版本开始，DIFF 函数可以在由 GROUP BY 划分出单独时间线的情况下用于超级表（也即 GROUP BY tbname）。
 
     示例：
     ```mysql
diff --git a/documentation20/en/00.index/docs.md b/documentation20/en/00.index/docs.md
new file mode 100644
index 0000000000000000000000000000000000000000..13f8a8565efea48ebb69702c1447ffd1c2b56b2f
--- /dev/null
+++ b/documentation20/en/00.index/docs.md
@@ -0,0 +1,142 @@
+# TDengine Documentation
+
+TDengine is a highly efficient platform to store, query, and analyze time-series data. It is specially designed and optimized for IoT, Internet of Vehicles, Industrial IoT, IT Infrastructure and Application Monitoring, etc. It works like a relational database, such as MySQL, but you are strongly encouraged to read through the following documentation before you experience it, especially the Data Model and Data Modeling sections. In addition to this document, you should also download and read our technology white paper. For the older TDengine version 1.6 documentation, please click here.
+
+## [TDengine Introduction](/evaluation)
+
+* [TDengine Introduction and Features](/evaluation#intro)
+* [TDengine Use Scenes](/evaluation#scenes)
+* [TDengine Performance Metrics and Verification]((/evaluation#))
+
+## [Getting Started](/getting-started)
+
+* [Quickly Install](/getting-started#install): install via source code/package / Docker within seconds
+
+- [Easy to Launch](/getting-started#start): start / stop TDengine with systemctl
+- [Command-line](/getting-started#console) : an easy way to access TDengine server
+- [Experience Lightning Speed](/getting-started#demo): running a demo, inserting/querying data to experience faster speed
+- [List of Supported Platforms](/getting-started#platforms): a list of platforms supported by TDengine server and client
+- [Deploy to Kubernetes](https://taosdata.github.io/TDengine-Operator/en/index.html)：a detailed guide for TDengine deployment in Kubernetes environment
+
+## [Overall Architecture](/architecture)
+
+- [Data Model](/architecture#model): relational database model, but one table for one device with static tags
+- [Cluster and Primary Logical Unit](/architecture#cluster): Take advantage of NoSQL, support scale-out and high-reliability
+- [Storage Model and Data Partitioning/Sharding](/architecture#sharding): tag data will be separated from time-series data, segmented by vnode and time
+- [Data Writing and Replication Process](/architecture#replication): records received are written to WAL, cached, with acknowledgement is sent back to client, while supporting multi-replicas
+- [Caching and Persistence](/architecture#persistence): latest records are cached in memory, but are written in columnar format with an ultra-high compression ratio
+- [Data Query](/architecture#query): support various functions, time-axis aggregation, interpolation, and multi-table aggregation
+
+## [Data Modeling](/model)
+
+- [Create a Database](/model#create-db): create a database for all data collection points with similar features
+- [Create a Super Table(STable)](/model#create-stable): create a STable for all data collection points with the same type
+- [Create a Table](/model#create-table): use STable as the template, to create a table for each data collecting point
+
+## [TAOS SQL](/taos-sql)
+
+- [Data Types](/taos-sql#data-type): support timestamp, int, float, nchar, bool, and other types
+- [Database Management](/taos-sql#management): add, drop, check databases
+- [Table Management](/taos-sql#table): add, drop, check, alter tables
+- [STable Management](/taos-sql#super-table): add, drop, check, alter STables
+- [Tag Management](/taos-sql#tags): add, drop, alter tags
+- [Inserting Records](/taos-sql#insert): support to write single/multiple items per table, multiple items across tables, and support to write historical data
+- [Data Query](/taos-sql#select): support time segment, value filtering, sorting, manual paging of query results, etc
+- [SQL Function](/taos-sql#functions): support various aggregation functions, selection functions, and calculation functions, such as avg, min, diff, etc
+- [Time Dimensions Aggregation](/taos-sql#aggregation): aggregate and reduce the dimension after cutting table data by time segment
+- [Boundary Restrictions](/taos-sql#limitation): restrictions for the library, table, SQL, and others
+- [Error Code](/taos-sql/error-code): TDengine 2.0 error codes and corresponding decimal codes
+
+## [Efficient Data Ingestion](/insert)
+
+- [SQL Ingestion](/insert#sql): write one or multiple records into one or multiple tables via SQL insert command
+- [Prometheus Ingestion](/insert#prometheus): Configure Prometheus to write data directly without any code
+- [Telegraf Ingestion](/insert#telegraf): Configure Telegraf to write collected data directly without any code
+- [EMQ X Broker](/insert#emq): Configure EMQ X to write MQTT data directly without any code
+- [HiveMQ Broker](/insert#hivemq): Configure HiveMQ to write MQTT data directly without any code
+
+## [Efficient Data Querying](/queries)
+
+- [Main Query Features](/queries#queries): support various standard functions, setting filter conditions, and querying per time segment
+- [Multi-table Aggregation Query](/queries#aggregation): use STable and set tag filter conditions to perform efficient aggregation queries
+- [Downsampling to Query Value](/queries#sampling): aggregate data in successive time windows, support interpolation
+
+## [Advanced Features](/advanced-features)
+
+- [Continuous Query](/advanced-features#continuous-query): Based on sliding windows, the data stream is automatically queried and calculated at regular intervals
+- [Data Publisher/Subscriber](/advanced-features#subscribe): subscribe to the newly arrived data like a typical messaging system
+- [Cache](/advanced-features#cache): the newly arrived data of each device/table will always be cached
+- [Alarm Monitoring](/advanced-features#alert): automatically monitor out-of-threshold data, and actively push it based-on configuration rules
+
+## [Connector](/connector)
+
+- [C/C++ Connector](/connector#c-cpp): primary method to connect to TDengine server through libtaos client library
+- [Java Connector(JDBC)]: driver for connecting to the server from Java applications using the JDBC API
+- [Python Connector](/connector#python): driver for connecting to TDengine server from Python applications
+- [RESTful Connector](/connector#restful): a simple way to interact with TDengine via HTTP
+- [Go Connector](/connector#go): driver for connecting to TDengine server from Go applications
+- [Node.js Connector](/connector#nodejs): driver for connecting to TDengine server from Node.js applications
+- [C# Connector](/connector#csharp): driver for connecting to TDengine server from C# applications
+- [Windows Client](https://www.taosdata.com/blog/2019/07/26/514.html): compile your own Windows client, which is required by various connectors on the Windows environment
+
+## [Connections with Other Tools](/connections)
+
+- [Grafana](/connections#grafana): query the data saved in TDengine and provide visualization
+- [Matlab](/connections#matlab): access data stored in TDengine server via JDBC configured within Matlab
+- [R](/connections#r): access data stored in TDengine server via JDBC configured within R
+- [IDEA Database](https://www.taosdata.com/blog/2020/08/27/1767.html): use TDengine visually through IDEA Database Management Tool
+
+## [Installation and Management of TDengine Cluster](/cluster)
+
+- [Preparation](/cluster#prepare): important considerations before deploying TDengine for production usage
+- [Create Your First Node](/cluster#node-one): simple to follow the quick setup
+- [Create Subsequent Nodes](/cluster#node-other): configure taos.cfg for new nodes to add more to the existing cluster
+- [Node Management](/cluster#management): add, delete, and check nodes in the cluster
+- [High-availability of Vnode](/cluster#high-availability): implement high-availability of Vnode through multi-replicas
+- [Mnode Management](/cluster#mnode): automatic system creation without any manual intervention
+- [Load Balancing](/cluster#load-balancing): automatically performed once the number of nodes or load changes
+- [Offline Node Processing](/cluster#offline): any node that offline for more than a certain period will be removed from the cluster
+- [Arbitrator](/cluster#arbitrator): used in the case of an even number of replicas to prevent split-brain
+
+## [TDengine Operation and Maintenance](/administrator)
+
+- [Capacity Planning](/administrator#planning): Estimating hardware resources based on scenarios
+- [Fault Tolerance and Disaster Recovery](/administrator#tolerance): set the correct WAL and number of data replicas
+- [System Configuration](/administrator#config): port, cache size, file block size, and other system configurations
+- [User Management](/administrator#user): add/delete TDengine users, modify user password
+- [Import Data](/administrator#import): import data into TDengine from either script or CSV file
+- [Export Data](/administrator#export): export data either from TDengine shell or from the taosdump tool
+- [System Monitor](/administrator#status): monitor the system connections, queries, streaming calculation, logs, and events
+- [File Directory Structure](/administrator#directories): directories where TDengine data files and configuration files located
+- [Parameter Restrictions and Reserved Keywords](/administrator#keywords): TDengine’s list of parameter restrictions and reserved keywords
+
+## TDengine Technical Design
+
+- [System Module]: taosd functions and modules partitioning
+- [Data Replication]: support real-time synchronous/asynchronous replication, to ensure high-availability of the system
+- [Technical Blog](https://www.taosdata.com/cn/blog/?categories=3): More technical analysis and architecture design articles
+
+## Common Tools
+
+- [TDengine sample import tools](https://www.taosdata.com/blog/2020/01/18/1166.html)
+- [TDengine performance comparison test tools](https://www.taosdata.com/blog/2020/01/18/1166.html)
+- [Use TDengine visually through IDEA Database Management Tool](https://www.taosdata.com/blog/2020/08/27/1767.html)
+
+## Performance: TDengine vs Others
+
+- [Performance: TDengine vs InfluxDB with InfluxDB’s open-source performance testing tool](https://www.taosdata.com/blog/2020/01/13/1105.html)
+- [Performance: TDengine vs OpenTSDB](https://www.taosdata.com/blog/2019/08/21/621.html)
+- [Performance: TDengine vs Cassandra](https://www.taosdata.com/blog/2019/08/14/573.html)
+- [Performance: TDengine vs InfluxDB](https://www.taosdata.com/blog/2019/07/19/419.html)
+- [Performance Test Reports of TDengine vs InfluxDB/OpenTSDB/Cassandra/MySQL/ClickHouse](https://www.taosdata.com/downloads/TDengine_Testing_Report_cn.pdf)
+
+## More on IoT Big Data
+
+- [Characteristics of IoT and Industry Internet Big Data](https://www.taosdata.com/blog/2019/07/09/characteristics-of-iot-big-data/)
+- [Features and Functions of IoT Big Data platforms](https://www.taosdata.com/blog/2019/07/29/542.html)
+- [Why don’t General Big Data Platforms Fit IoT Scenarios?](https://www.taosdata.com/blog/2019/07/09/why-does-the-general-big-data-platform-not-fit-iot-data-processing/)
+- [Why TDengine is the best choice for IoT, Internet of Vehicles, and Industry Internet Big Data platforms?](https://www.taosdata.com/blog/2019/07/09/why-tdengine-is-the-best-choice-for-iot-big-data-processing/)
+
+## FAQ
+
+- [FAQ: Common questions and answers](/faq)
diff --git a/documentation20/en/01.evaluation/docs.md b/documentation20/en/01.evaluation/docs.md
new file mode 100644
index 0000000000000000000000000000000000000000..89fb6443cb45bac411b0fa5238b4f5b224931c39
--- /dev/null
+++ b/documentation20/en/01.evaluation/docs.md
@@ -0,0 +1,65 @@
+# TDengine Introduction
+
+## <a class="anchor" id="intro"></a> About TDengine
+
+TDengine is an innovative Big Data processing product launched by Taos Data in the face of the fast-growing Internet of Things (IoT) Big Data market and technical challenges. It does not rely on any third-party software, nor does it optimize or package any open-source database or stream computing product. Instead, it is a product independently developed after absorbing the advantages of many traditional relational databases, NoSQL databases, stream computing engines, message queues, and other software. TDengine has its own unique Big Data processing advantages in time-series space.
+
+One of the modules of TDengine is the time-series database. However, in addition to this,  to reduce the complexity of research and development and the difficulty of system operation, TDengine also provides functions such as caching, message queuing, subscription, stream computing, etc. TDengine provides a full-stack technical solution for the processing of IoT and Industrial Internet BigData. It is an efficient and easy-to-use IoT Big Data platform. Compared with typical Big Data platforms such as Hadoop, TDengine has the following distinct characteristics:
+
+- **Performance improvement over 10 times**: An innovative data storage structure is defined, with each single core can process at least 20,000 requests per second, insert millions of data points, and read more than 10 million data points, which is more than 10 times faster than other existing general database.
+- **Reduce the cost of hardware or cloud services to 1/5**: Due to its ultra-performance, TDengine’s computing resources consumption is less than 1/5 of other common Big Data solutions; through columnar storage and advanced compression algorithms, the storage consumption is less than 1/10 of other general databases.
+- **Full-stack time-series data processing engine**: Integrate database, message queue, cache, stream computing, and other functions, and the applications do not need to integrate with software such as Kafka/Redis/HBase/Spark/HDFS, thus greatly reducing the complexity cost of application development and maintenance.
+- **Powerful analysis functions**: Data from ten years ago or one second ago, can all be queried based on a specified time range. Data can be aggregated on a timeline or multiple devices. Ad-hoc queries can be made at any time through Shell, Python, R, and Matlab.
+- **Seamless connection with third-party tools**: Integration with Telegraf, Grafana, EMQ, HiveMQ, Prometheus, Matlab, R, etc. without even one single line of code. OPC, Hadoop, Spark, etc. will be supported in the future, and more BI tools will be seamlessly connected to.
+- **Zero operation cost & zero learning cost**: Installing clusters is simple and quick, with real-time backup built-in, and no need to split libraries or tables. Similar to standard SQL, TDengine can support RESTful, Python/Java/C/C + +/C#/Go/Node.js, and similar to MySQL with zero learning cost.
+
+With TDengine, the total cost of ownership of typical IoT, Internet of Vehicles, and Industrial Internet Big Data platforms can be greatly reduced. However, it should be pointed out that due to making full use of the characteristics of IoT time-series data, TDengine cannot be used to process general data from web crawlers, microblogs, WeChat, e-commerce, ERP, CRM, and other sources.
+
+![TDengine Technology Ecosystem](page://images/eco_system.png)
+
+<center>Figure 1. TDengine Technology Ecosystem</center>
+
+## <a class="anchor" id="scenes"></a>Overall Scenarios of TDengine
+
+As an IoT Big Data platform, the typical application scenarios of TDengine are mainly presented in the IoT category, with users having a certain amount of data. The following sections of this document are mainly aimed at  IoT-relevant systems. Other systems, such as CRM, ERP, etc., are beyond the scope of this article.
+
+### Characteristics and Requirements of Data Sources
+
+From the perspective of data sources, designers can analyze the applicability of TDengine in target application systems as following.
+
+| **Data Source Characteristics and Requirements**         | **Not Applicable** | **Might Be Applicable** | **Very Applicable** | **Description**                                              |
+| -------------------------------------------------------- | ------------------ | ----------------------- | ------------------- | :----------------------------------------------------------- |
+| A huge amount of total data                              |                    |                         | √                   | TDengine provides excellent scale-out functions in terms of capacity, and has a storage structure matching high compression ratio to achieve the best storage efficiency in the industry. |
+| Data input velocity is occasionally or continuously huge |                    |                         | √                   | TDengine's performance is much higher than other similar products. It can continuously process a large amount of input data in the same hardware environment, and provide a performance evaluation tool that can easily run in the user environment. |
+| A huge amount of data sources                            |                    |                         | √                   | TDengine is designed to include optimizations specifically for a huge amount of data sources, such as data writing and querying, which is especially suitable for efficiently processing massive (tens of millions or more) data sources. |
+
+### System Architecture Requirements
+
+| **System Architecture Requirements**              | **Not Applicable** | **Might Be Applicable** | **Very Applicable** | **Description**                                              |
+| ------------------------------------------------- | ------------------ | ----------------------- | ------------------- | ------------------------------------------------------------ |
+| Require a simple and reliable system architecture |                    |                         | √                   | TDengine's system architecture is very simple and reliable, with its own message queue, cache, stream computing, monitoring and other functions, and no need to integrate any additional third-party products. |
+| Require fault-tolerance and high-reliability      |                    |                         | √                   | TDengine has cluster functions to automatically provide high-reliability functions such as fault tolerance and disaster recovery. |
+| Standardization specifications                    |                    |                         | √                   | TDengine uses standard SQL language to provide main functions and follow standardization specifications. |
+
+### System Function Requirements
+
+| **System Architecture Requirements**              | **Not Applicable** | **Might Be Applicable** | **Very Applicable** | **Description**                                              |
+| ------------------------------------------------- | ------------------ | ----------------------- | ------------------- | ------------------------------------------------------------ |
+| Require completed data processing algorithms built-in |                    | √                    |                     | TDengine implements various general data processing algorithms, but has not properly handled all requirements of different industries, so special types of processing shall be processed at the application level. |
+| Require a huge amount of crosstab queries             |                    | √                    |                     | This type of processing should be handled more by relational database systems, or TDengine and relational database systems should fit together to implement system functions. |
+
+### System Performance Requirements
+
+| **System Architecture Requirements**              | **Not Applicable** | **Might Be Applicable** | **Very Applicable** | **Description**                                              |
+| ------------------------------------------------- | ------------------ | ----------------------- | ------------------- | ------------------------------------------------------------ |
+| Require larger total processing capacity     |                    |                      | √                   | TDengine’s cluster functions can easily improve processing capacity via multi-server-cooperating. |
+| Require high-speed data processing           |                    |                      | √                   | TDengine’s storage and data processing are designed to be optimized for IoT, can generally improve the processing speed by multiple times than other similar products. |
+| Require fast processing of fine-grained data |                    |                      | √                   | TDengine has achieved the same level of performance with relational and NoSQL data processing systems. |
+
+### System Maintenance Requirements
+
+| **System Architecture Requirements**              | **Not Applicable** | **Might Be Applicable** | **Very Applicable** | **Description**                                              |
+| ------------------------------------------------- | ------------------ | ----------------------- | ------------------- | ------------------------------------------------------------ |
+| Require system with high-reliability         |                    |                      | √                   | TDengine has a very robust and reliable system architecture to implement simple and convenient daily operation with streamlined experiences for operators, thus human errors and accidents are eliminated to the greatest extent. |
+| Require controllable operation learning cost |                    |                      | √                   | As above.                                                    |
+| Require abundant talent supply               | √                  |                      |                     | As a new-generation product, it’s still difficult to find talents with TDengine experiences from market. However, the learning cost is low. As the vendor, we also provide extensive operation training and counselling services. |
diff --git a/documentation20/en/02.getting-started/docs.md b/documentation20/en/02.getting-started/docs.md
new file mode 100644
index 0000000000000000000000000000000000000000..fcfb88a6fe2fd48e39241a2ba7e7d2b8e347a3ff
--- /dev/null
+++ b/documentation20/en/02.getting-started/docs.md
@@ -0,0 +1,223 @@
+# Quick Start
+
+## <a class="anchor" id="install"></a>Quick Install
+
+TDegnine software consists of 3 parts: server, client, and alarm module. At the moment, TDengine server only runs on Linux (Windows, mac OS and more OS supports will come soon), but client can run on either Windows or Linux. TDengine client can be installed and run on Windows or Linux. Applications based-on any OSes can all connect to server taosd via a RESTful interface. About CPU, TDegnine supports X64/ARM64/MIPS64/Alpha64, and ARM32、RISC-V, other more CPU architectures will be supported soon. You can set up and install TDengine server either from the [source code](https://www.taosdata.com/en/getting-started/#Install-from-Source) or the [packages](https://www.taosdata.com/en/getting-started/#Install-from-Package).
+
+### <a class="anchor" id="source-install"></a>Install from Source
+
+Please visit our [TDengine github page](https://github.com/taosdata/TDengine) for instructions on installation from the source code.
+
+### Install from Docker Container
+
+Please visit our [TDengine Official Docker Image: Distribution, Downloading, and Usage](https://www.taosdata.com/blog/2020/05/13/1509.html).
+
+### <a class="anchor" id="package-install"></a>Install from Package
+
+It’s extremely easy to install for TDegnine, which takes only a few seconds from downloaded to successful installed. The server installation package includes clients and connectors. We provide 3 installation packages, which you can choose according to actual needs:
+
+Click [here](https://www.taosdata.com/cn/getting-started/#%E9%80%9A%E8%BF%87%E5%AE%89%E8%A3%85%E5%8C%85%E5%AE%89%E8%A3%85) to download the install package.
+
+For more about installation process, please refer [TDengine Installation Packages: Install and Uninstall](https://www.taosdata.com/blog/2019/08/09/566.html), and [Video Tutorials](https://www.taosdata.com/blog/2020/11/11/1941.html).
+
+## <a class="anchor" id="start"></a>Quick Launch
+
+After installation, you can start the TDengine service by the `systemctl` command.
+
+```bash
+$ systemctl start taosd
+```
+
+Then check if the service is working now.
+
+```bash
+$ systemctl status taosd
+```
+
+If the service is running successfully, you can play around through TDengine shell `taos`.
+
+**Note:**
+
+- The `systemctl` command needs the **root** privilege. Use **sudo** if you are not the **root** user.
+- To get better product feedback and improve our solution, TDegnine will collect basic usage information, but you can modify the configuration parameter **telemetryReporting** in the system configuration file taos.cfg, and set it to 0 to turn it off.
+- TDegnine uses FQDN (usually hostname) as the node ID. In order to ensure normal operation, you need to set hostname for the server running taosd, and configure DNS service or hosts file for the machine running client application, to ensure the FQDN can be resolved.
+- TDengine supports installation on Linux systems with[ systemd ](https://en.wikipedia.org/wiki/Systemd)as the process service management, and uses `which systemctl` command to detect whether `systemd` packages exist in the system:
+  
+  ```bash
+  $ which systemctl
+  ```
+
+If `systemd` is not supported in the system, TDengine service can also be launched via `/usr/local/taos/bin/taosd` manually.
+
+## <a class="anchor" id="console"></a>TDengine Shell Command Line
+
+To launch TDengine shell, the command line interface, in a Linux terminal, type:
+
+```bash
+$ taos
+```
+
+The welcome message is printed if the shell connects to TDengine server successfully, otherwise, an error message will be printed (refer to our [FAQ](https://www.taosdata.com/en/faq) page for troubleshooting the connection error). The TDengine shell prompt is:
+
+```cmd
+taos>
+```
+
+In the TDengine shell, you can create databases, create tables and insert/query data with SQL. Each query command ends with a semicolon. It works like MySQL, for example:
+
+```mysql
+create database demo;
+
+use demo;
+
+create table t (ts timestamp, speed int);
+
+insert into t values ('2019-07-15 00:00:00', 10);
+
+insert into t values ('2019-07-15 01:00:00', 20);
+
+select * from t;
+
+ts     |  speed  |
+
+===================================
+
+19-07-15 00:00:00.000|     10|
+
+19-07-15 01:00:00.000|     20|
+
+Query OK, 2 row(s) in set (0.001700s)
+```
+
+Besides the SQL commands, the system administrator can check system status, add or delete accounts, and manage the servers.
+
+### Shell Command Line Parameters
+
+You can configure command parameters to change how TDengine shell executes. Some frequently used options are listed below:
+
+- -c, --config-dir: set the configuration directory. It is */etc/taos* by default.
+- -h, --host: set the IP address of the server it will connect to. Default is localhost.
+- -s, --commands: set the command to run without entering the shell.
+- -u, -- user: user name to connect to server. Default is root.
+- -p, --password: password. Default is 'taosdata'.
+- -?, --help: get a full list of supported options.
+
+Examples:
+
+```bash
+$ taos -h 192.168.0.1 -s "use db; show tables;"
+```
+
+### Run SQL Command Scripts
+
+Inside TDengine shell, you can run SQL scripts in a file with source command.
+
+```mysql
+taos> source <filename>;
+```
+
+### Shell Tips
+
+- Use up/down arrow key to check the command history
+- To change the default password, use "alter user" command
+- Use ctrl+c to interrupt any queries
+- To clean the schema of local cached tables, execute command `RESET QUERY CACHE`
+
+## <a class="anchor" id="demo"></a>Experience TDengine’s Lightning Speed
+
+After starting the TDengine server, you can execute the command `taosdemo` in the Linux terminal.
+
+```bash 
+$ taosdemo
+```
+
+Using this command, a STable named `meters` will be created in the database `test` There are 10k tables under this stable, named from `t0` to `t9999`. In each table there are 100k rows of records, each row with columns （`f1`, `f2` and `f3`. The timestamp is from "2017-07-14 10:40:00 000" to "2017-07-14 10:41:39 999". Each table also has tags `areaid` and `loc`: `areaid` is set from 1 to 10, `loc` is set to "beijing" or "shanghai".
+
+It takes about 10 minutes to execute this command. Once finished, 1 billion rows of records will be inserted.
+
+In the TDengine client, enter sql query commands and then experience our lightning query speed.
+
+- query total rows of records：
+
+```mysql
+taos> select count(*) from test.meters;
+```
+
+- query average, max and min of the total 1 billion records：
+
+```mysql
+taos> select avg(f1), max(f2), min(f3) from test.meters;
+```
+
+- query the number of records where loc="beijing":
+
+```mysql
+taos> select count(*) from test.meters where loc="beijing";
+```
+
+- query the average, max and min of total records where areaid=10：
+
+```mysql
+taos> select avg(f1), max(f2), min(f3) from test.meters where areaid=10;
+```
+
+- query the average, max, min from table t10 when aggregating over every 10s:
+
+```mysql
+taos> select avg(f1), max(f2), min(f3) from test.t10 interval(10s);
+```
+
+**Note**: you can run command `taosdemo` with many options, like number of tables, rows of records and so on. To know more about these options, you can execute `taosdemo --help` and then take a try using different options.
+
+## Client and Alarm Module
+
+If your client and server running on different machines, please install the client separately. Linux and Windows packages are provided:
+
+- TDengine-client-2.0.10.0-Linux-x64.tar.gz(3.0M)
+- TDengine-client-2.0.10.0-Windows-x64.exe(2.8M)
+- TDengine-client-2.0.10.0-Windows-x86.exe(2.8M)
+
+Linux package of Alarm Module is as following (please refer [How to Use Alarm Module](https://github.com/taosdata/TDengine/blob/master/alert/README_cn.md)):
+
+- TDengine-alert-2.0.10.0-Linux-x64.tar.gz (8.1M)
+
+## <a class="anchor" id="platforms"></a>List of Supported Platforms
+
+List of platforms supported by TDengine server
+
+|                    | **CentOS 6/7/8** | **Ubuntu 16/18/20** | **Other Linux** | UnionTech UOS | NeoKylin | LINX V60/V80 |
+| ------------------ | ---------------- | ------------------- | --------------- | ------------- | -------- | ------------ |
+| X64                | ●                | ●                   |                 | ○             | ●        | ●            |
+| Raspberry ARM32    |                  | ●                   | ●               |               |          |              |
+| Loongson MIPS64    |                  |                     | ●               |               |          |              |
+| Kunpeng ARM64      |                  | ○                   | ○               |               | ●        |              |
+| SWCPU Alpha64      |                  |                     | ○               | ●             |          |              |
+| FT ARM64           |                  | ○Ubuntu Kylin       |                 |               |          |              |
+| Hygon X64          | ●                | ●                   | ●               | ○             | ●        | ●            |
+| Rockchip ARM64/32  |                  |                     | ○               |               |          |              |
+| Allwinner ARM64/32 |                  |                     | ○               |               |          |              |
+| Actions ARM64/32   |                  |                     | ○               |               |          |              |
+| TI ARM32           |                  |                     | ○               |               |          |              |
+
+Note: ● has been verified by official tests; ○ has been verified by unofficial tests. 
+
+List of platforms supported by TDengine client and connectors
+
+At the moment, TDengine connectors can support a wide range of platforms, including hardware platforms such as X64/X86/ARM64/ARM32/MIPS/Alpha, and development environments such as Linux/Win64/Win32.
+
+Comparison matrix as following:
+
+| **CPU**     | **X64 64bit** |           |           | **X86 32bit** | **ARM64** | **ARM32** | **MIPS Godson** | **Alpha Shenwei** | **X64 TimecomTech** |
+| ----------- | ------------- | --------- | --------- | ------------- | --------- | --------- | --------------- | ----------------- | ------------------- |
+| **OS**      | **Linux**     | **Win64** | **Win32** | **Win32**     | **Linux** | **Linux** | **Linux**       | **Linux**         | **Linux**           |
+| **C/C++**   | ●             | ●         | ●         | ○             | ●         | ●         | ●               | ●                 | ●                   |
+| **JDBC**    | ●             | ●         | ●         | ○             | ●         | ●         | ●               | ●                 | ●                   |
+| **Python**  | ●             | ●         | ●         | ○             | ●         | ●         | ●               | --                | ●                   |
+| **Go**      | ●             | ●         | ●         | ○             | ●         | ●         | ○               | --                | --                  |
+| **NodeJs**  | ●             | ●         | ○         | ○             | ●         | ●         | ○               | --                | --                  |
+| **C#**      | ○             | ●         | ●         | ○             | ○         | ○         | ○               | --                | --                  |
+| **RESTful** | ●             | ●         | ●         | ●             | ●         | ●         | ●               | ●                 | ●                   |
+
+Note: ● has been verified by official tests; ○ has been verified by unofficial tests.
+
+Please visit [Connectors](https://www.taosdata.com/en/documentation/connector) section for more detailed information.
diff --git a/documentation20/en/03.architecture/docs.md b/documentation20/en/03.architecture/docs.md
new file mode 100644
index 0000000000000000000000000000000000000000..2e5fc7bd18e7a61d30b658678dab02d7a9ca2cae
--- /dev/null
+++ b/documentation20/en/03.architecture/docs.md
@@ -0,0 +1,436 @@
+# Data Model and Architecture
+
+## <a class="anchor" id="model"></a> Data Model
+
+### A Typical IoT Scenario
+
+In typical IoT, Internet of Vehicles and Operation Monitoring scenarios, there are often many different types of data collecting devices that collect one or more different physical metrics. However, for the collection devices of the same type, there are often many specific collection devices distributed in places. BigData processing system aims to collect all kinds of data, and then calculate and analyze them. For the same kind of devices, the data collected are very regular. Taking smart meters as an example, assuming that each smart meter collects three metrics of current, voltage and phase, the collected data are similar to the following table:
+
+<figure><table>
+<thead><tr>
+    <th style="text-align:center;">Device ID</th>
+    <th style="text-align:center;">Time Stamp</th>
+    <th style="text-align:center;" colspan="3">Collected Metrics</th>
+    <th style="text-align:center;" colspan="2">Tags</th>
+    </tr>
+
+<tr>
+<th style="text-align:center;">Device ID</th>
+<th style="text-align:center;">Time Stamp</th>
+<th style="text-align:center;">current</th>
+<th style="text-align:center;">voltage</th>
+<th style="text-align:center;">phase</th>
+<th style="text-align:center;">location</th>
+<th style="text-align:center;">groupId</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td style="text-align:center;">d1001</td>
+<td style="text-align:center;">1538548685000</td>
+<td style="text-align:center;">10.3</td>
+<td style="text-align:center;">219</td>
+<td style="text-align:center;">0.31</td>
+<td style="text-align:center;">Beijing.Chaoyang</td>
+<td style="text-align:center;">2</td>
+</tr>
+<tr>
+<td style="text-align:center;">d1002</td>
+<td style="text-align:center;">1538548684000</td>
+<td style="text-align:center;">10.2</td>
+<td style="text-align:center;">220</td>
+<td style="text-align:center;">0.23</td>
+<td style="text-align:center;">Beijing.Chaoyang</td>
+<td style="text-align:center;">3</td>
+</tr>
+<tr>
+<td style="text-align:center;">d1003</td>
+<td style="text-align:center;">1538548686500</td>
+<td style="text-align:center;">11.5</td>
+<td style="text-align:center;">221</td>
+<td style="text-align:center;">0.35</td>
+<td style="text-align:center;">Beijing.Haidian</td>
+<td style="text-align:center;">3</td>
+</tr>
+<tr>
+<td style="text-align:center;">d1004</td>
+<td style="text-align:center;">1538548685500</td>
+<td style="text-align:center;">13.4</td>
+<td style="text-align:center;">223</td>
+<td style="text-align:center;">0.29</td>
+<td style="text-align:center;">Beijing.Haidian</td>
+<td style="text-align:center;">2</td>
+</tr>
+<tr>
+<td style="text-align:center;">d1001</td>
+<td style="text-align:center;">1538548695000</td>
+<td style="text-align:center;">12.6</td>
+<td style="text-align:center;">218</td>
+<td style="text-align:center;">0.33</td>
+<td style="text-align:center;">Beijing.Chaoyang</td>
+<td style="text-align:center;">2</td>
+</tr>
+<tr>
+<td style="text-align:center;">d1004</td>
+<td style="text-align:center;">1538548696600</td>
+<td style="text-align:center;">11.8</td>
+<td style="text-align:center;">221</td>
+<td style="text-align:center;">0.28</td>
+<td style="text-align:center;">Beijing.Haidian</td>
+<td style="text-align:center;">2</td>
+</tr>
+<tr>
+<td style="text-align:center;">d1002</td>
+<td style="text-align:center;">1538548696650</td>
+<td style="text-align:center;">10.3</td>
+<td style="text-align:center;">218</td>
+<td style="text-align:center;">0.25</td>
+<td style="text-align:center;">Beijing.Chaoyang</td>
+<td style="text-align:center;">3</td>
+</tr>
+<tr>
+<td style="text-align:center;">d1001</td>
+<td style="text-align:center;">1538548696800</td>
+<td style="text-align:center;">12.3</td>
+<td style="text-align:center;">221</td>
+<td style="text-align:center;">0.31</td>
+<td style="text-align:center;">Beijing.Chaoyang</td>
+<td style="text-align:center;">2</td>
+</tr>
+</tbody>
+</table></figure>
+
+<center> Table 1: Smart meter example data </center>
+
+Each data record contains the device ID, timestamp, collected metrics (current, voltage, phase as above), and static tags (Location and groupId in Table 1) associated with the devices. Each device generates a data record in a pre-defined timer or triggered by an external event. It is a sequence of data points like a stream.
+
+### Data Characteristics
+
+As the data points are a series of data points over time, the data points generated by IoT, Internet of Vehicles, and Operation Monitoring have some strong common characteristics:
+
+1. Metrics are always structured data;
+2. There are rarely delete/update operations on collected data;
+3. No need for transactions of traditional databases
+4. The ratio of reading is lower but write is higher than typical Internet applications;
+5. data flow is uniform and can be predicted according to the number of devices and collection frequency;
+6. the user pays attention to the trend of data, not a specific value at a specific time;
+7. there is always a data retention policy;
+8. the data query is always executed in a given time range and a subset of space;
+9. in addition to storage and query operations, various statistical and real-time calculation operations are also required;
+10. data volume is huge, a system may generate over 10 billion data points in a day.
+
+By utilizing the above characteristics, TDengine designs the storage and computing engine in a special and optimized way for time-series data, resulting in massive improvements in system efficiency.
+
+### Relational Database Model
+
+Since time-series data is most likely to be structured data, TDengine adopts the traditional relational database model to process them with a shallow learning curve. You need to create a database, create tables with schema definitions, then insert data points and execute queries to explore the data. Standard SQL is used, instead of NoSQL’s key-value storage.
+
+### One Table for One Collection Point
+
+To utilize this time-series and other data features, TDengine requires the user to create a table for each collection point to store collected time-series data. For example, if there are over 10 millions  smart meters, means 10 millions  tables shall be created. For the table above, 4 tables shall be created for devices D1001, D1002, D1003, and D1004 to store the data collected. This design has several advantages:
+
+1. Guarantee that all data from a collection point can be saved in a continuous memory/hard disk space block by block. If queries are applied only on one point in a time range, this design will reduce the random read latency significantly, thus increase read and query speed by orders of magnitude.
+2. Since the data generation process of each collection device is completely independent, means each device has its unique data source, thus writes can be carried out in a lock-free manner to greatly improve the speed.
+3. Write latency can be significantly reduced too as the data points generated by the same device will arrive in time order, the new data point will be simply appended to a block.
+
+If the data of multiple devices are written into a table in the traditional way, due to the uncontrollable network delay, the timing of the data from different devices arriving at the server cannot be guaranteed, the writing operation must be protected by locks, and the data of one device cannot be guaranteed to continuously stored together. **The method of one table for each data collection point can ensure the optimal performance of insertion and query of a single data collection point to the greatest extent.**
+
+TDengine suggests using collection point ID as the table name (like D1001 in the above table). Each point may collect one or more metrics (like the current, voltage, phase as above). Each metric has a column in the table. The data type for a column can be int, float, string and others. In addition, the first column in the table must be a timestamp. TDengine uses the time stamp as the index, and won’t build the index on any metrics stored. All data will be stored in columns.
+
+### STable: A Collection of Data Points in the Same Type
+
+The method of one table for each point will bring a greatly increasing number of tables, which is difficult to manage. Moreover, applications often need to take aggregation operations between collection points, thus aggregation operations will become complicated. To support aggregation over multiple tables efficiently, the [STable(Super Table)](https://www.taosdata.com/en/documentation/super-table) concept is introduced by TDengine.
+
+STable is an abstract collection for a type of data point. A STable contains a set of points (tables) that have the same schema or data structure, but with different static attributes (tags). To describe a STable (a combination of data collection points of a specific type), in addition to defining the table structure of the collected metrics, it is also necessary to define the schema of its tag. The data type of tags can be int, float, string, and there can be multiple tags, which can be added, deleted, or modified afterward. If the whole system has N different types of data collection points, N STables need to be established.
+
+In the design of TDengine, **a table is used to represent a specific data collection point, and STable is used to represent a set of data collection points of the same type**. When creating a table for a specific data collection point, the user uses the definition of STable as a template and specifies the tag value of the specific collection point (table). Compared with the traditional relational database, the table (a data collection point) has static tags, and these tags can be added, deleted, and modified afterward. **A STable contains multiple tables with the same time-series data schema but different tag values.**
+
+When aggregating multiple data collection points with the same data type, TDEngine will first find out the tables that meet the tag filters from the STables, and then scan the time-series data of these tables to perform aggregation operation, which can greatly reduce the data sets to be scanned, thus greatly improving the performance of aggregation calculation.
+
+## <a class="anchor" id="cluster"></a> Cluster and Primary Logic Unit
+
+The design of TDengine is based on the assumption that one single hardware or software system is unreliable and that no single computer can provide sufficient computing and storage resources to process massive data. Therefore, TDengine has been designed according to a distributed and high-reliability architecture since Day One of R&D, which supports scale-out, so that hardware failure or software failure of any single or multiple servers will not affect the availability and reliability of the system. At the same time, through node virtualization and automatic load-balancing technology, TDengine can make the most efficient use of computing and storage resources in heterogeneous clusters to reduce hardware investment.
+
+### Primary Logic Unit
+
+Logical structure diagram of TDengine distributed architecture as following:
+
+![TDengine architecture diagram](page://images/architecture/structure.png)
+<center> Picture 1: TDengine architecture diagram  </center>
+
+
+
+A complete TDengine system runs on one or more physical nodes. Logically, it includes data node (dnode), TDEngine application driver (taosc) and application (app). There are one or more data nodes in the system, which form a cluster. The application interacts with the TDengine cluster through taosc's API. The following is a brief introduction to each logical unit.
+
+**Physical node (pnode)**: A pnode is a computer that runs independently and has its own computing, storage and network capabilities. It can be a physical machine, virtual machine or Docker container installed with OS. The physical node is identified by its configured FQDN (Fully Qualified Domain Name). TDengine relies entirely on FQDN for network communication. If you don't know about FQDN, please read the blog post "[All about FQDN of TDengine](https://www.taosdata.com/blog/2020/09/11/1824.html)".
+
+**Data node (dnode):** A dnode is a running instance of the TDengine server-side execution code taosd on a physical node. A working system must have at least one data node. A dnode contains zero to multiple logical virtual nodes (VNODE), zero or at most one logical management node (mnode). The unique identification of a dnode in the system is determined by the instance's End Point (EP). EP is a combination of FQDN (Fully Qualified Domain Name) of the physical node where the dnode is located and the network port number (Port) configured by the system. By configuring different ports, a physical node (a physical machine, virtual machine or container) can run multiple instances or have multiple data nodes.
+
+**Virtual node (vnode)**: In order to better support data sharding, load balancing and prevent data from overheating or skewing, data nodes are virtualized into multiple virtual nodes (vnode, V2, V3, V4, etc. in the figure). Each vnode is a relatively independent work unit, which is the basic unit of time-series data storage, and has independent running threads, memory space and persistent storage path. A vnode contains a certain number of tables (data collection points). When a new table is created, the system checks whether a new vnode needs to be created. The number of vnodes that can be created on a data node depends on the hardware capacities of the physical node where the data node is located. A vnode belongs to only one DB, but a DB can have multiple vnodes. In addition to the stored time-series data, a vnode also stores the schema and tag values of the included tables. A virtual node is uniquely identified in the system by the EP of the data node and the VGroup ID to which it belongs, and is created and managed by the management node.
+
+**Management node (mnode)**: A virtual logical unit responsible for monitoring and maintaining the running status of all data nodes and load balancing among nodes (M in figure). At the same time, the management node is also responsible for the storage and management of metadata (including users, databases, tables, static tags, etc.), so it is also called Meta Node. Multiple (up to 5) mnodes can be configured in a TDengine cluster, and they are automatically constructed into a virtual management node group (M0, M1, M2 in the figure). The master/slave mechanism is used to manage between mnodes, and the data synchronization is carried out in a strong consistent way. Any data update operation can only be done on the master. The creation of mnode cluster is completed automatically by the system without manual intervention. There is at most one mnode on each dnode, which is uniquely identified by the EP of the data node to which it belongs. Each dnode automatically obtains the EP of the dnode where all mnodes in the whole cluster are located through internal messaging interaction.
+
+**Virtual node group (VGroup)**: Vnodes on different data nodes can form a virtual node group to ensure the high reliability of the system. The virtual node group is managed in a master/slave structure. Write operations can only be performed on the master vnode, and the system synchronizes data to the slave vnode via replication, thus ensuring that one single replica of data is copied on multiple physical nodes. The number of virtual nodes in a vgroup equals the number of data replicas. If the number of replicas of a DB is N, the system must have at least N data nodes. The number of replicas can be specified by the parameter replica when creating DB, and the default is 1. Using the multi-replica feature of TDengine, the same high data reliability can be done without the need for expensive storage devices such as disk arrays. Virtual node group is created and managed by management node, and the management node assigns a system unique ID, aka VGroup ID. If two virtual nodes has the same vnode group ID, means that they belong to the same group and the data is backed up to each other. The number of virtual nodes in a virtual node group can be dynamically changed, allowing only one, that is, no data replication. VGroup ID is never changed. Even if a virtual node group is deleted, its ID will not be reused.
+
+**TAOSC**: TAOSC is the driver provided by TDengine to applications, which is responsible for dealing with the interface interaction between application and cluster, and provides the native interface of C/C + + language, which is embedded in JDBC, C #, Python, Go, Node.js language connection libraries. Applications interact with the whole cluster through taosc instead of directly connecting to data nodes in the cluster. This module is responsible for obtaining and caching metadata; forwarding requests for insertion, query, etc. to the correct data node; when returning the results to the application, taosc also need to be responsible for the final level of aggregation, sorting, filtering and other operations. For JDBC, C/C + +/C #/Python/Go/Node.js interfaces, this module runs on the physical node where the application is located. At the same time, in order to support the fully distributed RESTful interface, taosc has a running instance on each dnode of TDengine cluster.
+
+### Node Communication
+
+**Communication mode**: The communication among each data node of TDengine system, and among application driver and each data node is carried out through TCP/UDP. Considering an IoT scenario, the data writing packets are generally not large, so TDengine uses UDP in addition to TCP for transmission, because UDP is more efficient and is not limited by the number of connections. TDengine implements its own timeout, retransmission, confirmation and other mechanisms to ensure reliable transmission of UDP. For packets with a data volume of less than 15K, UDP is adopted for transmission, and TCP is automatically adopted for transmission of packets with a data volume of more than 15K or query operations. At the same time, TDengine will automatically compress/decompress the data, digital sign/authenticate the data according to the configuration and data packet. For data replication among data nodes, only TCP is used for data transmission.
+
+**FQDN configuration:** A data node has one or more FQDNs, which can be specified in the system configuration file taos.cfg with the parameter "fqdn". If it is not specified, the system will automatically use the hostname of the computer as its FQDN. If the node is not configured with FQDN, you can directly set the configuration parameter fqdn of the node to its IP address. However, IP is not recommended because IP address is variable, and once it changes, the cluster will not work properly. The EP (End Point) of a data node consists of FQDN + Port. With FQDN, it is necessary to ensure the normal operation of DNS service, or configure hosts files on nodes and the nodes where applications are located.
+
+**Port configuration**: The external port of a data node is determined by the system configuration parameter serverPort in TDengine, and the port for internal communication of cluster is serverPort+5. The data replication operation among data nodes in the cluster also occupies a TCP port, which is serverPort+10. In order to support multithreading and efficient processing of UDP data, each internal and external UDP connection needs to occupy 5 consecutive ports. Therefore, the total port range of a data node will be serverPort to serverPort + 10, for a total of 11 TCP/UDP ports. When using, make sure that the firewall keeps these ports open. Each data node can be configured with a different serverPort.
+
+**Cluster external connection**: TDengine cluster can accommodate one single, multiple or even thousands of data nodes. The application only needs to initiate a connection to any data node in the cluster. The network parameter required for connection is the End Point (FQDN plus configured port number) of a data node. When starting the application taos through CLI, the FQDN of the data node can be specified through the option-h, and the configured port number can be specified through -p. If the port is not configured, the system configuration parameter serverPort of TDengine will be adopted.
+
+**Inter-cluster communication**: Data nodes connect with each other through TCP/UDP. When a data node starts, it will obtain the EP information of the dnode where the mnode is located, and then establish a connection with the mnode in the system to exchange information. There are three steps to obtain EP information of the mnode: 1. Check whether the mnodeEpList file exists, if it does not exist or cannot be opened normally to obtain EP information of the mnode, skip to the second step; 2: Check the system configuration file taos.cfg to obtain node configuration parameters firstEp and secondEp (the node specified by these two parameters can be a normal node without mnode, in this case, the node will try to redirect to the mnode node when connected). If these two configuration parameters do not exist or do not exist in taos.cfg, or are invalid, skip to the third step; 3: Set your own EP as a mnode EP and run it independently. After obtaining the mnode EP list, the data node initiates the connection. It will successfully join the working cluster after connected. If not successful, it will try the next item in the mnode EP list. If all attempts are made, but the connection still fails, sleep for a few seconds before trying again.
+
+**The choice of MNODE**: TDengine logically has a management node, but there is no separated execution code. The server side only has a set of execution code taosd. So which data node will be the management node? This is determined automatically by the system without any manual intervention. The principle is as follows: when a data node starts, it will check its End Point and compare it with the obtained mnode EP List. If its EP exists in it, the data node shall start the mnode module and become a mnode. If your own EP is not in the mnode EP List, the mnode module will not start. During the system operation, due to load balancing, downtime and other reasons, mnode may migrate to the new dnode, while totally transparent without manual intervention. The modification of configuration parameters is the decision made by mnode itself according to resources usage.
+
+**Add new data nodes:** After the system has a data node, it has become a working system. There are two steps to add a new node into the cluster. Step1: Connect to the existing working data node using TDengine CLI, and then add the End Point of the new data node with the command "create dnode"; Step 2: In the system configuration parameter file taos.cfg of the new data node, set the firstEp and secondEp parameters to the EP of any two data nodes in the existing cluster. Please refer to the detailed user tutorial for detailed steps. In this way, the cluster will be established step by step.
+
+**Redirection**: No matter about dnode or taosc, the connection to the mnode shall be initiated first, but the mnode is automatically created and maintained by the system, so user does not know which dnode is running the mnode. TDengine only requires a connection to any working dnode in the system. Because any running dnode maintains the currently running mnode EP List, when receiving a connecting request from the newly started dnode or taosc, if it’s not an mnode by self, it will reply the mnode EP List back. After receiving this list, taosc or the newly started dnode will try to establish the connection again. When the mnode EP List changes, each data node quickly obtains the latest list and notifies taosc through messaging interaction among nodes.
+
+### A Typical Messaging Process
+
+To explain the relationship between vnode, mnode, taosc and application and their respective roles, the following is an analysis of a typical data writing process.
+
+![ typical process of TDengine](page://images/architecture/message.png)
+<center> Picture 2  typical process of TDengine </center>
+
+1. Application initiates a request to insert data through JDBC, ODBC, or other APIs.
+2. Cache be checked by taosc that if meta data existing for the table. If so, go straight to Step 4. If not, taosc sends a get meta-data request to mnode.
+3. Mnode returns the meta-data of the table to taosc. Meta-data contains the schema of the table, and also the vgroup information to which the table belongs (the vnode ID and the End Point of the dnode where the table belongs. If the number of replicas is N, there will be N groups of End Points). If taosc does not receive a response from the mnode for a long time, and there are multiple mnodes, taosc will send a request to the next mnode.
+4. Taosc initiates an insert request to master vnode.
+5. After vnode inserts the data, it gives a reply to taosc, indicating that the insertion is successful. If taosc doesn't get a response from vnode for a long time, taosc will judge the node as offline. In this case, if there are multiple replicas of the inserted database, taosc will issue an insert request to the next vnode in vgroup.
+6. Taosc notifies APP that writing is successful.
+
+For Step 2 and 3, when taosc starts, it does not know the End Point of mnode, so it will directly initiate a request to the externally serving End Point of the configured cluster. If the dnode that received the request does not have an mnode configured, it will inform the mnode EP list in a reply message, so that taosc will re-issue a request to obtain meta-data to the EP of another new mnode.
+
+For Step 4 and 5, without caching, taosc can't recognize the master in the virtual node group, so assumes that the first vnodeID is the master and send a request to it. If the requested vnode is not the master, it will reply the actual master as a new target taosc makes a request to. Once the reply of successful insertion is obtained, taosc will cache the information of master node.
+
+The above is the process of inserting data, and the processes of querying and calculating are completely consistent. Taosc encapsulates and shields all these complicated processes, and has no perception and no special treatment for applications.
+
+Through taosc caching mechanism, mnode needs to be accessed only when a table is operated for the first time, so mnode will not become a system bottleneck. However, because schema and vgroup may change (such as load balancing), taosc will interact with mnode regularly to automatically update the cache.
+
+## <a class="anchor" id="sharding"></a> Storage Model and Data Partitioning/Sharding
+
+### Storage Model
+
+The data stored by TDengine include collected time-series data, metadata related to libraries and tables, tag data, etc. These data are specifically divided into three parts:
+
+- Time-series data: stored in vnode and composed of data, head and last files. The amount of data is large and query amount depends on the application scenario. Out-of-order writing is allowed, but delete operation is not supported for the time being, and update operation is only allowed when update parameter is set to 1. By adopting the model with one table for each collection point, the data of a given time period is continuously stored, and the writing against one single table is a simple add operation. Multiple records can be read at one time, thus ensuring the insert and query operation of a single collection point with best performance.
+- Tag data: meta files stored in vnode support four standard operations of add, delete, modify and check. The amount of data is not large. If there are N tables, there are N records, so all can be stored in memory. If there are many tag filtering operations, queries will be very frequent and TDengine supports multi-core and multi-threaded concurrent queries. As long as the computing resources are sufficient, even in face of millions of tables, the filtering results will return in milliseconds.
+- Metadata: stored in mnode, including system node, user, DB, Table Schema and other information. Four standard operations of add, delete, modify and query are supported. The amount of these data are not large and can be stored in memory, moreover the query amount is not large because of the client cache. Therefore, TDengine uses centralized storage management, however, there will be no performance bottleneck.
+
+Compared with the typical NoSQL storage model, TDengine stores tag data and time-series data completely separately, which has two major advantages:
+
+- Greatly reduce the redundancy of tag data storage: general NoSQL database or time-series database adopts K-V storage, in which Key includes timestamp, device ID and various tags. Each record carries these duplicates, so wasting storage space. Moreover, if the application needs to add, modify or delete tags on historical data, it has to traverse the data and rewrite again, which is extremely expensive to operate.
+- Realize extremely efficient aggregation query between multiple tables: when doing aggregation query between multiple tables, it firstly finds out the tag filtered tables, and then find out the corresponding data blocks of these tables to greatly reduce the data sets to be scanned, thus greatly improving the query efficiency. Moreover, tag data is managed and maintained in a full-memory structure, and tag data queries in tens of millions can return in milliseconds.
+
+### Data Sharding
+
+For large-scale data management, to achieve scale-out, it is generally necessary to adopt the a Partitioning strategy as Sharding. TDengine implements data sharding via vnode, and time-series data partitioning via one data file for each time range.
+
+VNode (Virtual Data Node) is responsible for providing writing, query and calculation functions for collected time-series data. To facilitate load balancing, data recovery and support heterogeneous environments, TDengine splits a data node into multiple vnodes according to its computing and storage resources. The management of these vnodes is done automatically by TDengine and completely transparent to the application.
+
+For a single data collection point, regardless of the amount of data, a vnode (or vnode group, if the number of replicas is greater than 1) has enough computing resource and storage resource to process (if a 16-byte record is generated per second, the original data generated in one year will be less than 0.5 G), so TDengine stores all the data of a table (a data collection point) in one vnode instead of distributing the data to two or more dnodes. Moreover, a vnode can store data from multiple data collection points (tables), and the upper limit of the tables’ quantity for a vnode is one million. By design, all tables in a vnode belong to the same DB. On a data node, unless specially configured, the number of vnodes owned by a DB will not exceed the number of system cores.
+
+When creating a DB, the system does not allocate resources immediately. However, when creating a table, the system will check if there is an allocated vnode with free tablespace. If so, the table will be created in the vacant vnode immediately. If not, the system will create a new vnode on a dnode from the cluster according to the current workload, and then a table. If there are multiple replicas of a DB, the system does not create only one vnode, but a vgroup (virtual data node group). The system has no limit on the number of vnodes, which is just limited by the computing and storage resources of physical nodes.
+
+The meda data of each table (including schema, tags, etc.) is also stored in vnode instead of centralized storage in mnode. In fact, this means sharding of meta data, which is convenient for efficient and parallel tag filtering operations.
+
+### Data Partitioning
+
+In addition to vnode sharding, TDengine partitions the time-series data by time range. Each data file contains only one time range of time-series data, and the length of the time range is determined by DB's configuration parameter “days”. This method of partitioning by time rang is also convenient to efficiently implement the data retention strategy. As long as the data file exceeds the specified number of days (system configuration parameter ‘keep’), it will be automatically deleted. Moreover, different time ranges can be stored in different paths and storage media, so as to facilitate the cold/hot management of big data and realize tiered-storage.
+
+In general, **TDengine splits big data by vnode and time as two dimensions**, which is convenient for parallel and efficient management with scale-out.
+
+### Load Balancing
+
+Each dnode regularly reports its status (including hard disk space, memory size, CPU, network, number of virtual nodes, etc.) to the mnode (virtual management node) for declaring the status of the entire cluster. Based on the overall state, when an mnode finds an overloaded dnode, it will migrate one or more vnodes to other dnodes. In the process, external services keep running and the data insertion, query and calculation operations are not affected.
+
+If the mnode has not received the dnode status for a period of time, the dnode will be judged as offline. When offline lasts a certain period of time (the duration is determined by the configuration parameter ‘offlineThreshold’), the dnode will be forcibly removed from the cluster by mnode. If the number of replicas of vnodes on this dnode is greater than one, the system will automatically create new replicas on other dnodes to ensure the replica number. If there are other mnodes on this dnode and the number of mnodes replicas is greater than one, the system will automatically create new mnodes on other dnodes to ensure t the replica number.
+
+When new data nodes are added to the cluster, with new computing and storage are added, the system will automatically start the load balancing process.
+
+The load balancing process does not require any manual intervention without application restarted. It will automatically connect new nodes with completely transparence. **Note: load balancing is controlled by parameter “balance”, which determines to turn on/off automatic load balancing.**
+
+## <a class="anchor" id="replication"></a> Data Writing and Replication Process
+
+If a database has N replicas, thus a virtual node group has N virtual nodes, but only one as Master and all others are slaves. When the application writes a new record to system, only the Master vnode can accept the writing request. If a slave vnode receives a writing request, the system will notifies taosc to redirect.
+
+###  Master vnode Writing Process
+
+Master Vnode uses a writing process as follows:
+
+Figure 3: TDengine Master writing process
+
+1. Master vnode receives the application data insertion request, verifies, and to next step;
+2. If the system configuration parameter “walLevel” is greater than 0, vnode will write the original request packet into database log file WAL. If walLevel is set to 2 and fsync is set to 0, TDengine will make WAL data written immediately to ensure that even system goes down, all data can be recovered from database log file;
+3.  If there are multiple replicas, vnode will forward data packet to slave vnodes in the same virtual node group, and the forwarded packet has a version number with data;
+4. Write into memory and add the record to “skip list”;
+5. Master vnode returns a confirmation message to the application, indicating a successful writing.
+6. If any of Step 2, 3 or 4 fails, the error will directly return to the application.
+
+### Slave vnode Writing Process
+
+For a slave vnode, the write process as follows:
+
+![TDengine Slave Writing Process](page://images/architecture/write_master.png)
+<center> Picture 3 TDengine Slave Writing Process  </center>
+
+1. Slave vnode receives a data insertion request forwarded by Master vnode.
+2. If the system configuration parameter “walLevel” is greater than 0, vnode will write the original request packet into database log file WAL. If walLevel is set to 2 and fsync is set to 0, TDengine will make WAL data written immediately to ensure that even system goes down, all data can be recovered from database log file;
+3. Write into memory and add the record to “skip list”;
+
+Compared with Master vnode, slave vnode has no forwarding or reply confirmation step, means two steps less. But writing into memory is exactly the same as WAL.
+
+### Remote Disaster Recovery and IDC Migration
+
+As above Master and Slave processes discussed, TDengine adopts asynchronous replication for data synchronization. This method can greatly improve the writing performance, with not obvious impact from network delay. By configuring IDC and rack number for each physical node, it can be ensured that for a virtual node group, virtual nodes are composed of physical nodes from different IDC and different racks, thus implementing remote disaster recovery without other tools.
+
+On the other hand, TDengine supports dynamic modification of the replicas number. Once the number of replicas increases, the newly added virtual nodes will immediately enter the data synchronization process. After synchronization completed, added virtual nodes can provide services. In the synchronization process, master and other synchronized virtual nodes keep serving. With this feature, TDengine can realize IDC room migration without service interruption. It is only necessary to add new physical nodes to the existing IDC cluster, and then remove old physical nodes after the data synchronization is completed.
+
+However, this asynchronous replication method has a tiny time window of written data lost. The specific scenario is as follows:
+
+1. Master vnode has completed its 5-step operations, confirmed the success of writing to APP, and then went down;
+2. Slave vnode receives the write request, then processing fails before writing to the log in Step 2;
+3. Slave vnode will become the new master, thus losing one record
+
+In theory, as long as in asynchronous replication, there is no guarantee for no losing. However, this window is extremely small, only if mater and slave fail at the same time, and just confirm the successful write to the application before.
+
+Note: Remote disaster recovery and no-downtime IDC migration are only supported by Enterprise Edition. **Hint: This function is not available yet**
+
+### Master/slave Selection
+
+Vnode maintains a Version number. When memory data is persisted, the version number will also be persisted. For each data update operation, whether it is collecting time-series data or metadata, this version number will be increased by one.
+
+When a vnode starts, the roles (master, slave) are uncertain, and the data is in an unsynchronized state. It’s necessary to establish TCP connections with other nodes in the virtual node group and exchange status, including version and its own roles. Through the exchange, the system implements a master-selection process. The rules are as follows:
+
+1. If there’s only one replica, it’s always master
+2. When all replicas are online, the one with latest version is master
+3. Over half of online nodes are virtual nodes, and some virtual node is slave, it will automatically become master
+4. For 2 and 3, if multiple virtual nodes meet the requirement, the first vnode in virtual node group list will be selected as master
+
+See [TDengine 2.0 Data Replication Module Design](https://www.taosdata.com/cn/documentation/architecture/replica/) for more information on the data replication process.
+
+### Synchronous Replication
+
+For scenarios with higher data consistency requirements, asynchronous data replication is not applicable, because there is some small probability of data loss. So, TDengine provides a synchronous replication mechanism for users. When creating a database, in addition to specifying the number of replicas, user also needs to specify a new parameter “quorum”. If quorum is greater than one, it means that every time the Master forwards a message to the replica, it needs to wait for “quorum-1” reply confirms before informing the application that data has been successfully written in slave. If “quorum-1” reply confirms are not received within a certain period of time, the master vnode will return an error to the application.
+
+With synchronous replication, performance of system will decrease and latency will increase. Because metadata needs strong consistent, the default for data synchronization between mnodes is synchronous replication.
+
+Note: synchronous replication between vnodes is only supported in Enterprise Edition
+
+## <a class="anchor" id="persistence"></a> Caching and Persistence
+
+### Caching
+
+TDengine adopts a time-driven cache management strategy (First-In-First-Out, FIFO), also known as a Write-driven Cache Management Mechanism. This strategy is different from the read-driven data caching mode (Least-Recent-Used, LRU), which directly put the most recently written data in the system buffer. When the buffer reaches a threshold, the earliest data are written to disk in batches. Generally speaking, for the use of IoT data, users are most concerned about the newly generated data, that is, the current status. TDengine takes full advantage of this feature to put the most recently arrived (current state) data in the buffer.
+
+TDengine provides millisecond-level data collecting capability to users through query functions. Putting the recently arrived data directly in the buffer can respond to users' analysis query for the latest piece or batch of data more quickly, and provide faster database query response capability as a whole. In this sense, **TDengine can be used as a data buffer by setting appropriate configuration parameters without deploying Redis or other additional cache systems**, which can effectively simplify the system architecture and reduce the operation costs. It should be noted that after the TDengine is restarted, the buffer of the system will be emptied, the previously cached data will be written to disk in batches, and the previously cached data will not be reloaded into the buffer as so in a proprietary key-value cache system.
+
+Each vnode has its own independent memory, and it is composed of multiple memory blocks of fixed size, and different vnodes are completely isolated. When writing data, similar to the writing of logs, data is sequentially added to memory, but each vnode maintains its own skip list for quick search. When more than one third of the memory block are used, the disk writing operation will start, and the subsequent writing operation is carried out in a new memory block. By this design, one third of the memory blocks in a vnode keep the latest data, so as to achieve the purpose of caching and quick search. The number of memory blocks of a vnode is determined by the configuration parameter “blocks”, and the size of memory blocks is determined by the configuration parameter “cache”.
+
+### Persistent Storage
+
+TDengine uses a data-driven method to write the data from buffer into hard disk for persistent storage. When the cached data in vnode reaches a certain volume, TDengine will also pull up the disk-writing thread to write the cached data into persistent storage in order not to block subsequent data writing. TDengine will open a new database log file when the data is written, and delete the old database log file after written successfully to avoid unlimited log growth.
+
+To make full use of the characteristics of time-series data, TDengine splits the data stored in persistent storage by a vnode into multiple files, each file only saves data for a fixed number of days, which is determined by the system configuration parameter “days”. By so, for the given start and end date of a query, you can locate the data files to open immediately without any index, thus greatly speeding up reading operations.
+
+For collected data, there is generally a retention period, which is determined by the system configuration parameter “keep”. Data files exceeding this set number of days will be automatically deleted by the system to free up storage space.
+
+Given “days” and “keep” parameters, the total number of data files in a vnode is: keep/days. The total number of data files should not be too large or too small. 10 to 100 is appropriate. Based on this principle, reasonable days can be set. In the current version, parameter “keep” can be modified, but parameter “days” cannot be modified once it is set.
+
+In each data file, the data of a table is stored by blocks. A table can have one or more data file blocks. In a file block, data is stored in columns, occupying a continuous storage space, thus greatly improving the reading speed. The size of file block is determined by the system parameter “maxRows” (the maximum number of records per block), and the default value is 4096. This value should not be too large or too small. If it is too large, the data locating in search will cost longer; if too small, the index of data block is too large, and the compression efficiency will be low with slower reading speed.
+
+Each data file (with a .data postfix) has a corresponding index file (with a .head postfix). The index file has summary information of a data block for each table, recording the offset of each data block in the data file, start and end time of data and other information, so as to lead system quickly locate the data to be found. Each data file also has a corresponding last file (with a .last postfix), which is designed to prevent data block fragmentation when written in disk. If the number of written records from a table does not reach the system configuration parameter “minRows” (minimum number of records per block), it will be stored in the last file first. When write to disk next time, the newly written records will be merged with the records in last file and then written into data file.
+
+When data is written to disk, it is decided whether to compress the data according to system configuration parameter “comp”. TDengine provides three compression options: no compression, one-stage compression and two-stage compression, corresponding to comp values of 0, 1 and 2 respectively. One-stage compression is carried out according to the type of data. Compression algorithms include delta-delta coding, simple 8B method, zig-zag coding, LZ4 and other algorithms. Two-stage compression is based on one-stage compression and compressed by general compression algorithm, which has higher compression ratio.
+
+### Tiered Storage
+
+By default, TDengine saves all data in /var/lib/taos directory, and the data files of each vnode are saved in a different directory under this directory. In order to expand the storage space, minimize the bottleneck of file reading and improve the data throughput rate, TDengine can configure the system parameter “dataDir” to allow multiple mounted hard disks to be used by system at the same time. In addition, TDengine also provides the function of tiered data storage, i.e. storage on different storage media according to the time stamps of data files. For example, the latest data is stored on SSD, the data for more than one week is stored on local hard disk, and the data for more than four weeks is stored on network storage device, thus reducing the storage cost and ensuring efficient data access. The movement of data on different storage media is automatically done by the system and completely transparent to applications. Tiered storage of data is also configured through the system parameter “dataDir”.
+
+
+
+dataDir format is as follows:
+```
+dataDir data_path [tier_level]
+```
+
+Where data_path is the folder path of mount point and tier_level is the media storage-tier. The higher the media storage-tier, means the older the data file. Multiple hard disks can be mounted at the same storage-tier, and data files on the same storage-tier are distributed on all hard disks within the tier. TDengine supports up to 3 tiers of storage, so tier_level values are 0, 1, and 2. When configuring dataDir, there must be only one mount path without specifying tier_level, which is called special mount disk (path). The mount path defaults to level 0 storage media and contains special file links, which cannot be removed, otherwise it will have a devastating impact on the written data.
+
+
+
+Suppose a physical node with six mountable hard disks/mnt/disk1,/mnt/disk2, …,/mnt/disk6, where disk1 and disk2 need to be designated as level 0 storage media, disk3 and disk4 are level 1 storage media, and disk5 and disk6 are level 2 storage media. Disk1 is a special mount disk, you can configure it in/etc/taos/taos.cfg as follows:
+
+```
+dataDir /mnt/disk1/taos
+dataDir /mnt/disk2/taos 0
+dataDir /mnt/disk3/taos 1
+dataDir /mnt/disk4/taos 1
+dataDir /mnt/disk5/taos 2
+dataDir /mnt/disk6/taos 2
+```
+
+Mounted disks can also be a non-local network disk, as long as the system can access it.
+
+
+Note: Tiered Storage is only supported in Enterprise Edition
+
+## <a class="anchor" id="query"></a>Data Query
+
+TDengine provides a variety of query processing functions for tables and STables. In addition to common aggregation queries, TDengine also provides window queries and statistical aggregation functions for time-series data. The query processing of TDengine needs the collaboration of client, vnode and mnode.
+
+### Single Table Query
+
+The parsing and verification of SQL statements are completed on the client side. SQL statements are parsed and generate an Abstract Syntax Tree (AST), which is then checksummed. Then request metadata information (table metadata) for the table specified in the query from management node (mnode).
+
+According to the End Point information in metadata information, the query request is serialized and sent to the data node (dnode) where the table is located. After receiving the query, the dnode identifies the virtual node (vnode) pointed to and forwards the message to the query execution queue of the vnode. The query execution thread of vnode establishes the basic query execution environment, immediately returns the query request and starts executing the query at the same time.
+
+When client obtains query result, the worker thread in query execution queue of dnode will wait for the execution of vnode execution thread to complete before returning the query result to the requesting client.
+
+### Aggregation by Time Axis, Downsampling, Interpolation
+
+The remarkable feature that time-series data is different from ordinary data is that each record has a timestamp, so aggregating data with timestamps on the time axis is an important and unique function from common databases. From this point of view, it is similar to the window query of stream computing engine.
+
+The keyword “interval” is introduced into TDengine to split fixed length time windows on time axis, and the data are aggregated according to time windows, and the data within window range are aggregated as needed. For example:
+
+```mysql
+select count(*) from d1001 interval(1h);
+```
+
+According to the data collected by device D1001, the number of records stored per hour is returned by a 1-hour time window.
+
+
+
+In application scenarios where query results need to be obtained continuously, if there is data missing in a given time interval, the data results in this interval will also be lost. TDengine provides a strategy to interpolate the results of timeline aggregation calculation. The results of time axis aggregation can be interpolated by using keyword Fill. For example:
+
+```mysql
+select count(*) from d1001 interval(1h) fill(prev);
+```
+
+According to the data collected by device D1001, the number of records per hour is counted. If there is no data in a certain hour, statistical data of the previous hour is returned. TDengine provides forward interpolation (prev), linear interpolation (linear), NULL value populating (NULL), and specific value populating (value).
+
+### Multi-table Aggregation Query
+
+TDengine creates a separate table for each data collection point, but in practical applications, it is often necessary to aggregate data from different collection points. In order to perform aggregation operations efficiently, TDengine introduces the concept of STable. STable is used to represent a specific type of data collection point. It is a table set containing multiple tables. The schema of each table in the set is completely consistent, but each table has its own static tag. The tags can be multiple and be added, deleted and modified at any time. Applications can aggregate or statistically operate all or a subset of tables under a STABLE by specifying tag filters, thus greatly simplifying the development of applications. The process is shown in the following figure:
+
+![Diagram of multi-table aggregation query](page://images/architecture/multi_tables.png)
+<center> Picture 4 Diagram of multi-table aggregation query  </center>
+
+1. Application sends a query condition to system;
+2. taosc sends the STable name to Meta Node(management node);
+3. Management node sends the vnode list owned by the STable back to taosc;
+4. taosc sends the computing request together with tag filters to multiple data nodes corresponding to these vnodes;
+5. Each vnode first finds out the set of tables within its own node that meet the tag filters from memory, then scans the stored time-series data, completes corresponding aggregation calculations, and returns result to taosc;
+6. taosc finally aggregates the results returned by multiple data nodes and send them back to application.
+
+Since TDengine stores tag data and time-series data separately in vnode, by filtering tag data in memory, the set of tables that need to participate in aggregation operation is first found, which greatly reduces the volume of data scanned and improves aggregation calculation speed. At the same time, because the data is distributed in multiple vnodes/dnodes, the aggregation calculation operation is carried out concurrently in multiple vnodes, which further improves the aggregation speed. Aggregation functions for ordinary tables and most operations are applicable to STables. The syntax is exactly the same. Please see TAOS SQL for details.
+
+### Precomputation
+
+In order to effectively improve the performance of query processing, based-on the unchangeable feature of IoT data, statistical information of data stored in data block is recorded in the head of data block, including max value, min value, and sum. We call it a precomputing unit. If the query processing involves all the data of a whole data block, the pre-calculated results are directly used, and no need to read the data block contents at all. Since the amount of pre-calculated data is much smaller than the actual size of data block stored on disk, for query processing with disk IO as bottleneck, the use of pre-calculated results can greatly reduce the pressure of reading IO and accelerate the query process. The precomputation mechanism is similar to the index BRIN (Block Range Index) of PostgreSQL.
diff --git a/documentation20/en/04.model/docs.md b/documentation20/en/04.model/docs.md
new file mode 100644
index 0000000000000000000000000000000000000000..5ab5e0c6a56d0b5d534386752988cb1adae3b2fa
--- /dev/null
+++ b/documentation20/en/04.model/docs.md
@@ -0,0 +1,74 @@
+# Data Modeling
+
+TDengine adopts a relational data model, so we need to build the "database" and "table". Therefore, for a specific application scenario, it is necessary to consider the design of the database, STable and ordinary table. This section does not discuss detailed syntax rules, but only concepts.
+
+Please watch the [video tutorial](https://www.taosdata.com/blog/2020/11/11/1945.html) for data modeling.
+
+## <a class="anchor" id="create-db"></a> Create a Database
+
+Different types of data collection points often have different data characteristics, including frequency of data collecting, length of data retention time, number of replicas, size of data blocks, whether to update data or not, and so on. To ensure TDengine working with great efficiency in various scenarios, TDengine suggests creating tables with different data characteristics in different databases, because each database can be configured with different storage strategies. When creating a database, in addition to SQL standard options, the application can also specify a variety of parameters such as retention duration, number of replicas, number of memory blocks, time accuracy, max and min number of records in a file block, whether it is compressed or not, and number of days a data file will be overwritten. For example:
+
+```mysql
+CREATE DATABASE power KEEP 365 DAYS 10 BLOCKS 4 UPDATE 1;
+```
+
+The above statement will create a database named “power”. The data of this database will be kept for 365 days (it will be automatically deleted 365 days later), one data file created per 10 days, and the number of memory blocks is 4 for data updating. For detailed syntax and parameters, please refer to [Data Management section of TAOS SQL](https://www.taosdata.com/en/documentation/taos-sql#management).
+
+After the database created, please use SQL command USE to switch to the new database, for example:
+
+```mysql
+USE power;	
+```
+
+Replace the database operating in the current connection with “power”, otherwise, before operating on a specific table, you need to use "database name. table name" to specify the name of database to use.
+
+**Note:**
+
+- Any table or STable belongs to a database. Before creating a table, a database must be created first.
+- Tables in two different databases cannot be JOIN.
+
+## <a class="anchor" id="create-stable"></a> Create a STable
+
+An IoT system often has many types of devices, such as smart meters, transformers, buses, switches, etc. for power grids. In order to facilitate aggregation among multiple tables, using TDengine, it is necessary to create a STable for each type of data collection point. Taking the smart meter in Table 1 as an example, you can use the following SQL command to create a STable:
+
+```mysql
+CREATE STABLE meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupdId int);
+```
+
+**Note:** The STABLE keyword in this instruction needs to be written as TABLE in versions before 2.0.15.
+
+Just like creating an ordinary table, you need to provide the table name (‘meters’ in the example) and the table structure Schema, that is, the definition of data columns. The first column must be a timestamp (‘ts’ in the example), the other columns are the physical metrics collected (current, volume, phase in the example), and the data types can be int, float, string, etc. In addition, you need to provide the schema of the tag (location, groupId in the example), and the data types of the tag can be int, float, string and so on. Static attributes of collection points can often be used as tags, such as geographic location of collection points, device model, device group ID, administrator ID, etc. The schema of the tag can be added, deleted and modified afterwards. Please refer to the [STable Management section of TAOS SQL](https://www.taosdata.com/cn/documentation/taos-sql#super-table) for specific definitions and details.
+
+Each type of data collection point needs an established STable, so an IoT system often has multiple STables. For the power grid, we need to build a STable for smart meters, transformers, buses, switches, etc. For IoT, a device may have multiple data collection points (for example, a fan for wind-driven generator, some collection points capture parameters such as current and voltage, and some capture environmental parameters such as temperature, humidity and wind direction). In this case, multiple STables need to be established for corresponding types of devices. All collected physical metrics contained in one and the same STable must be collected at the same time (with a consistent timestamp).
+
+A STable allows up to 1024 columns. If the number of physical metrics collected at a collection point exceeds 1024, multiple STables need to be built to process them. A system can have multiple DBs, and a DB can have one or more STables.
+
+## <a class="anchor" id="create-table"></a> Create a Table
+
+TDengine builds a table independently for each data collection point. Similar to standard relational data, one table has a table name, Schema, but in addition, it can also carry one or more tags. When creating, you need to use the STable as a template and specify the specific value of the tag. Taking the smart meter in Table 1 as an example, the following SQL command can be used to build the table:
+
+```mysql
+CREATE TABLE d1001 USING meters TAGS ("Beijing.Chaoyang", 2);
+```
+
+Where d1001 is the table name, meters is the name of the STable, followed by the specific tag value of tag Location as "Beijing.Chaoyang", and the specific tag value of tag groupId 2. Although the tag value needs to be specified when creating the table, it can be modified afterwards. Please refer to the [Table Management section of TAOS SQL](https://www.taosdata.com/en/documentation/taos-sql#table) for details.
+
+**Note: ** At present, TDengine does not technically restrict the use of a STable of a database (dbA) as a template to create a sub-table of another database (dbB). This usage will be prohibited later, and it is not recommended to use this method to create a table.
+
+TDengine suggests to use the globally unique ID of data collection point as a table name (such as device serial number). However, in some scenarios, there is no unique ID, and multiple IDs can be combined into a unique ID. It is not recommended to use a unique ID as tag value.
+
+**Automatic table creating** : In some special scenarios, user is not sure whether the table of a certain data collection point exists when writing data. In this case, the non-existent table can be created by using automatic table building syntax when writing data. If the table already exists, no new table will be created. For example:
+
+```mysql
+INSERT INTO d1001 USING METERS TAGS ("Beijng.Chaoyang", 2) VALUES (now, 10.2, 219, 0.32);
+```
+
+The SQL statement above inserts records (now, 10.2, 219, 0.32) into table d1001. If table d1001 has not been created yet, the STable meters is used as the template to automatically create it, and the tag value "Beijing.Chaoyang", 2 is marked at the same time.
+
+For detailed syntax of automatic table building, please refer to the "[Automatic Table Creation When Inserting Records](https://www.taosdata.com/en/documentation/taos-sql#auto_create_table)" section.
+
+## Multi-column Model vs Single-column Model
+
+TDengine supports multi-column model. As long as physical metrics are collected simultaneously by a data collection point (with a consistent timestamp), these metrics can be placed in a STable as different columns. However, there is also an extreme design, a single-column model, in which each collected physical metric is set up separately, so each type of physical metrics is set up separately with a STable. For example, create 3 Stables, one each for current, voltage and phase.
+
+TDengine recommends using multi-column model as much as possible because of higher insertion and storage efficiency. However, for some scenarios, types of collected metrics often change. In this case, if multi-column model is adopted, the structure definition of STable needs to be frequently modified so make the application complicated. To avoid that, single-column model is recommended.
diff --git a/documentation20/en/05.insert/docs.md b/documentation20/en/05.insert/docs.md
new file mode 100644
index 0000000000000000000000000000000000000000..23576099cf6375a6a556dad531a862ce90accd5a
--- /dev/null
+++ b/documentation20/en/05.insert/docs.md
@@ -0,0 +1,282 @@
+# Efficient Data Writing
+
+TDengine supports multiple interfaces to write data, including SQL, Prometheus, Telegraf, EMQ MQTT Broker, HiveMQ Broker, CSV file, etc. Kafka, OPC and other interfaces will be provided in the future. Data can be inserted in a single piece or in batches, data from one or multiple data collection points can be inserted at the same time. TDengine supports multi-thread insertion, nonsequential data insertion, and also historical data insertion.
+
+## <a class="anchor" id="sql"></a> SQL Writing
+
+Applications insert data by executing SQL insert statements through C/C + +, JDBC, GO, or Python Connector, and users can manually enter SQL insert statements to insert data through TAOS Shell. For example, the following insert writes a record to table d1001:
+
+```mysql
+INSERT INTO d1001 VALUES (1538548685000, 10.3, 219, 0.31);
+```
+
+TDengine supports writing multiple records at a time. For example, the following command writes two records to table d1001:
+
+```mysql
+INSERT INTO d1001 VALUES (1538548684000, 10.2, 220, 0.23) (1538548696650, 10.3, 218, 0.25);
+```
+
+TDengine also supports writing data to multiple tables at a time. For example, the following command writes two records to d1001 and one record to d1002:
+
+```mysql
+INSERT INTO d1001 VALUES (1538548685000, 10.3, 219, 0.31) (1538548695000, 12.6, 218, 0.33) d1002 VALUES (1538548696800, 12.3, 221, 0.31);
+```
+
+For the SQL INSERT Grammar, please refer to  [Taos SQL insert](https://www.taosdata.com/en/documentation/taos-sql#insert)。
+
+**Tips:**
+
+- To improve writing efficiency, batch writing is required. The more records written in a batch, the higher the insertion efficiency. However, a record cannot exceed 16K, and the total length of an SQL statement cannot exceed 64K (it can be configured by parameter maxSQLLength, and the maximum can be configured to 1M).
+- TDengine supports multi-thread parallel writing. To further improve writing speed, a client needs to open more than 20 threads to write parallelly. However, after the number of threads reaches a certain threshold, it cannot be increased or even become decreased, because too much frequent thread switching brings extra overhead.
+- For a same table, if the timestamp of a newly inserted record already exists, (no database was created using UPDATE 1) the new record will be discarded as default, that is, the timestamp must be unique in a table. If an application automatically generates records, it is very likely that the generated timestamps will be the same, so the number of records successfully inserted will be smaller than the number of records the application try to insert. If you use UPDATE 1 option when creating a database, inserting a new record with the same timestamp will overwrite the original record.
+- The timestamp of written data must be greater than the current time minus the time of configuration parameter keep. If keep is configured for 3650 days, data older than 3650 days cannot be written. The timestamp for writing data cannot be greater than the current time plus configuration parameter days. If days is configured to 2, data 2 days later than the current time cannot be written.
+
+## <a class="anchor" id="prometheus"></a> Direct Writing of Prometheus
+
+As a graduate project of Cloud Native Computing Foundation, [Prometheus](https://www.prometheus.io/) is widely used in the field of performance monitoring and K8S performance monitoring. TDengine provides a simple tool [Bailongma](https://github.com/taosdata/Bailongma), which only needs to be simply configured in Prometheus without any code, and can directly write the data collected by Prometheus into TDengine, then automatically create databases and related table entries in TDengine according to rules. Blog post [Use Docker Container to Quickly Build a Devops Monitoring Demo](https://www.taosdata.com/blog/2020/02/03/1189.html), which is an example of using bailongma to write Prometheus and Telegraf data into TDengine.
+
+### Compile blm_prometheus From Source
+
+Users need to download the source code of [Bailongma](https://github.com/taosdata/Bailongma) from github, then compile and generate an executable file using Golang language compiler. Before you start compiling, you need to complete following prepares:
+
+- A server running Linux OS
+- Golang version 1.10 and higher installed
+- An appropriated TDengine version. Because the client dynamic link library of TDengine is used, it is necessary to install the same version of TDengine as the server-side; for example, if the server version is TDengine 2.0. 0, ensure install the same version on the linux server where bailongma is located (can be on the same server as TDengine, or on a different server)
+
+Bailongma project has a folder, blm_prometheus, which holds the prometheus writing API. The compiling process is as follows:
+
+```bash
+cd blm_prometheus
+
+go build
+```
+
+If everything goes well, an executable of blm_prometheus will be generated in the corresponding directory.
+
+### Install Prometheus
+
+Download and install as the instruction of Prometheus official website. [Download Address](https://prometheus.io/download/)
+
+### Configure Prometheus
+
+Read the Prometheus [configuration document](https://prometheus.io/docs/prometheus/latest/configuration/configuration/) and add following configurations in the section of Prometheus configuration file
+
+- url: The URL provided by bailongma API service, refer to the blm_prometheus startup example section below
+
+After Prometheus launched, you can check whether data is written successfully through query taos client.
+
+### Launch blm_prometheus
+
+blm_prometheus has following options that you can configure when you launch blm_prometheus.
+
+```sh
+--tdengine-name
+
+If TDengine is installed on a server with a domain name, you can also access the TDengine by configuring the domain name of it. In K8S environment, it can be configured as the service name that TDengine runs
+
+--batch-size
+
+blm_prometheus assembles the received prometheus data into a TDengine writing request. This parameter controls the number of data pieces carried in a writing request sent to TDengine at a time.
+
+--dbname
+
+Set a name for the database created in TDengine, blm_prometheus will automatically create a database named dbname in TDengine, and the default value is prometheus.
+
+--dbuser
+
+Set the user name to access TDengine, the default value is'root '
+
+--dbpassword
+
+Set the password to access TDengine, the default value is'taosdata '
+
+--port
+
+The port number blm_prometheus used to serve prometheus.
+```
+
+
+
+### Example
+
+Launch an API service for blm_prometheus with the following command:
+
+```bash
+./blm_prometheus -port 8088
+```
+
+Assuming that the IP address of the server where blm_prometheus located is "10.1.2. 3", the URL shall be added to the configuration file of Prometheus as:
+
+remote_write:
+
+\- url: "http://10.1.2.3:8088/receive"
+
+
+
+### Query written data of prometheus
+
+The format of generated data by Prometheus is as follows:
+
+```json
+{
+  Timestamp: 1576466279341,
+  Value: 37.000000, 
+  apiserver_request_latencies_bucket {
+  component="apiserver", 
+   instance="192.168.99.116:8443", 
+   job="kubernetes-apiservers", 
+   le="125000", 
+   resource="persistentvolumes", s
+   cope="cluster",
+   verb="LIST", 
+   version=“v1" 
+  }
+}
+```
+
+Where apiserver_request_latencies_bucket is the name of the time-series data collected by prometheus, and the tag of the time-series data is in the following {}. blm_prometheus automatically creates a STable in TDengine with the name of the time series data, and converts the tag in {} into the tag value of TDengine, with Timestamp as the timestamp and value as the value of the time-series data. Therefore, in the client of TDEngine, you can check whether this data was successfully written through the following instruction.
+
+```mysql
+use prometheus;
+
+select * from apiserver_request_latencies_bucket;
+```
+
+
+
+## <a class="anchor" id="telegraf"></a> Direct Writing of Telegraf
+
+[Telegraf](https://www.influxdata.com/time-series-platform/telegraf/) is a popular open source tool for IT operation data collection. TDengine provides a simple tool [Bailongma](https://github.com/taosdata/Bailongma), which only needs to be simply configured in Telegraf without any code, and can directly write the data collected by Telegraf into TDengine, then automatically create databases and related table entries in TDengine according to rules. Blog post [Use Docker Container to Quickly Build a Devops Monitoring Demo](https://www.taosdata.com/blog/2020/02/03/1189.html), which is an example of using bailongma to write Prometheus and Telegraf data into TDengine.
+
+### Compile blm_telegraf From Source Code
+
+Users need to download the source code of [Bailongma](https://github.com/taosdata/Bailongma) from github, then compile and generate an executable file using Golang language compiler. Before you start compiling, you need to complete following prepares:
+
+- A server running Linux OS
+- Golang version 1.10 and higher installed
+- An appropriated TDengine version. Because the client dynamic link library of TDengine is used, it is necessary to install the same version of TDengine as the server-side; for example, if the server version is TDengine 2.0. 0, ensure install the same version on the linux server where bailongma is located (can be on the same server as TDengine, or on a different server)
+
+Bailongma project has a folder, blm_telegraf, which holds the Telegraf writing API. The compiling process is as follows:
+
+```bash
+cd blm_telegraf
+
+go build
+```
+
+If everything goes well, an executable of blm_telegraf will be generated in the corresponding directory.
+
+### Install Telegraf
+
+At the moment, TDengine supports Telegraf version 1.7. 4 and above. Users can download the installation package on Telegraf's website according to your current operating system. The download address is as follows: https://portal.influxdata.com/downloads
+
+### Configure Telegraf
+
+Modify the TDengine-related configurations in the Telegraf configuration file /etc/telegraf/telegraf.conf.
+
+In the output plugins section, add the [[outputs.http]] configuration:
+
+- url: The URL provided by bailongma API service, please refer to the example section below
+- data_format: "json"
+- json_timestamp_units: "1ms"
+
+In agent section:
+
+- hostname: The machine name that distinguishes different collection devices, and it is necessary to ensure its uniqueness
+- metric_batch_size: 100, which is the max number of records per batch wriiten by Telegraf allowed. Increasing the number can reduce the request sending frequency of Telegraf.
+
+For information on how to use Telegraf to collect data and more about using Telegraf, please refer to the official [document](https://docs.influxdata.com/telegraf/v1.11/) of Telegraf.
+
+### Launch blm_telegraf
+
+blm_telegraf has following options, which can be set to tune configurations of blm_telegraf when launching.
+
+```sh
+--host
+
+The ip address of TDengine server, default is null
+
+--batch-size
+
+blm_prometheus assembles the received telegraf data into a TDengine writing request. This parameter controls the number of data pieces carried in a writing request sent to TDengine at a time.
+
+--dbname
+
+Set a name for the database created in TDengine, blm_telegraf will automatically create a database named dbname in TDengine, and the default value is prometheus.
+
+--dbuser
+
+Set the user name to access TDengine, the default value is 'root '
+
+--dbpassword
+
+Set the password to access TDengine, the default value is'taosdata '
+
+--port
+
+The port number blm_telegraf used to serve Telegraf.
+```
+
+
+
+### Example
+
+Launch an API service for blm_telegraf with the following command
+
+```bash
+./blm_telegraf -host 127.0.0.1 -port 8089
+```
+
+Assuming that the IP address of the server where blm_telegraf located is "10.1.2. 3", the URL shall be added to the configuration file of telegraf as:
+
+```yaml
+url = "http://10.1.2.3:8089/telegraf"
+```
+
+### Query written data of telegraf
+
+The format of generated data by telegraf is as follows:
+
+```json
+{
+  "fields": {
+    "usage_guest": 0, 
+    "usage_guest_nice": 0,
+    "usage_idle": 89.7897897897898, 
+    "usage_iowait": 0,
+    "usage_irq": 0,
+    "usage_nice": 0,
+    "usage_softirq": 0,
+    "usage_steal": 0,
+    "usage_system": 5.405405405405405, 
+    "usage_user": 4.804804804804805
+  },
+  
+  "name": "cpu", 
+  "tags": {
+    "cpu": "cpu2",
+    "host": "bogon" 
+  },
+  "timestamp": 1576464360 
+}
+```
+
+Where the name field is the name of the time-series data collected by telegraf, and the tag field is the tag of the time-series data. blm_telegraf automatically creates a STable in TDengine with the name of the time series data, and converts the tag field into the tag value of TDengine, with Timestamp as the timestamp and fields values as the value of the time-series data. Therefore, in the client of TDEngine, you can check whether this data was successfully written through the following instruction.
+
+```mysql
+use telegraf;
+
+select * from cpu;
+```
+
+MQTT is a popular data transmission protocol in the IoT. TDengine can easily access the data received by MQTT Broker and write it to TDengine.
+
+## <a class="anchor" id="emq"></a> Direct Writing of EMQ Broker
+
+[EMQ](https://github.com/emqx/emqx) is an open source MQTT Broker software, with no need of coding, only to use "rules" in EMQ Dashboard for simple configuration, and MQTT data can be directly written into TDengine. EMQ X supports storing data to the TDengine by sending it to a Web service, and also provides a native TDengine driver on Enterprise Edition for direct data store. Please refer to [EMQ official documents](https://docs.emqx.io/broker/latest/cn/rule/rule-example.html#%E4%BF%9D%E5%AD%98%E6%95%B0%E6%8D%AE%E5%88%B0-tdengine) for more details.
+
+
+
+## <a class="anchor" id="hivemq"></a> Direct Writing of HiveMQ Broker
+
+[HiveMQ](https://www.hivemq.com/) is an MQTT agent that provides Free Personal and Enterprise Edition versions. It is mainly used for enterprises, emerging machine-to-machine(M2M) communication and internal transmission to meet scalability, easy management and security features. HiveMQ provides an open source plug-in development kit. You can store data to TDengine via HiveMQ extension-TDengine. Refer to the [HiveMQ extension-TDengine documentation](https://github.com/huskar-t/hivemq-tdengine-extension/blob/b62a26ecc164a310104df57691691b237e091c89/README.md) for more details.
diff --git a/documentation20/en/06.queries/docs.md b/documentation20/en/06.queries/docs.md
new file mode 100644
index 0000000000000000000000000000000000000000..f5d2b43e2bc4d9de829968ade95d99bfd7d4a63a
--- /dev/null
+++ b/documentation20/en/06.queries/docs.md
@@ -0,0 +1,99 @@
+# Efficient Data Querying
+
+## <a class="anchor" id="queries"></a> Main Query Features
+
+TDengine uses SQL as the query language. Applications can send SQL statements through C/C + +, Java, Go, Python connectors, and users can manually execute SQL Ad-Hoc Query through the Command Line Interface (CLI) tool TAOS Shell provided by TDengine. TDengine supports the following query functions:
+
+- Single-column and multi-column data query
+- Multiple filters for tags and numeric values: >, <, =, < >, like, etc
+- Group by, Order by, Limit/Offset of aggregation results
+- Four operations for numeric columns and aggregation results
+- Time stamp aligned join query (implicit join) operations
+- Multiple aggregation/calculation functions: count, max, min, avg, sum, twa, stddev, leastsquares, top, bottom, first, last, percentile, apercentile, last_row, spread, diff, etc
+
+For example, in TAOS shell, the records with vlotage > 215 are queried from table d1001, sorted in descending order by timestamps, and only two records are outputted.
+
+```mysql
+taos> select * from d1001 where voltage > 215 order by ts desc limit 2;
+           ts            |       current        |   voltage   |        phase         |
+======================================================================================
+ 2018-10-03 14:38:16.800 |             12.30000 |         221 |              0.31000 |
+ 2018-10-03 14:38:15.000 |             12.60000 |         218 |              0.33000 |
+Query OK, 2 row(s) in set (0.001100s)
+```
+
+In order to meet the needs of an IoT scenario, TDengine supports several special functions, such as twa (time weighted average), spread (difference between maximum and minimum), last_row (last record), etc. More functions related to IoT scenarios will be added. TDengine also supports continuous queries.
+
+For specific query syntax, please see the [Data Query section of TAOS SQL](https://www.taosdata.com/cn/documentation/taos-sql#select).
+
+## <a class="anchor" id="aggregation"></a> Multi-table Aggregation Query
+
+In an IoT scenario, there are often multiple data collection points in a same type. TDengine uses the concept of STable to describe a certain type of data collection point, and an ordinary table to describe a specific data collection point. At the same time, TDengine uses tags to describe the statical attributes of data collection points. A given data collection point has a specific tag value. By specifying the filters of tags, TDengine provides an efficient method to aggregate and query the sub-tables of STables (data collection points of a certain type). Aggregation functions and most operations on ordinary tables are applicable to STables, and the syntax is exactly the same.
+
+**Example 1**: In TAOS Shell, look up the average voltages collected by all smart meters in Beijing and group them by location
+
+```mysql
+taos> SELECT AVG(voltage) FROM meters GROUP BY location;
+       avg(voltage)        |            location            |
+=============================================================
+             222.000000000 | Beijing.Haidian                |
+             219.200000000 | Beijing.Chaoyang               |
+Query OK, 2 row(s) in set (0.002136s)
+```
+
+**Example 2**: In TAOS Shell, look up the number of records with groupId 2 in the past 24 hours, check the maximum current of all smart meters
+
+```mysql
+taos> SELECT count(*), max(current) FROM meters where groupId = 2 and ts > now - 24h;
+     cunt(*)  |    max(current)  |
+==================================
+            5 |             13.4 |
+Query OK, 1 row(s) in set (0.002136s)
+```
+
+TDengine only allows aggregation queries between tables belonging to a same STable, means aggregation queries between different STables are not supported. In the Data Query section of TAOS SQL, query class operations will all be indicated that whether STables are supported.
+
+## <a class="anchor" id="sampling"></a> Down Sampling Query, Interpolation
+
+In a scenario of IoT, it is often necessary to aggregate the collected data by intervals through down sampling. TDengine provides a simple keyword interval, which makes query operations according to time windows extremely simple. For example, the current values collected by smart meter d1001 are summed every 10 seconds.
+
+```mysql
+taos> SELECT sum(current) FROM d1001 INTERVAL(10s);
+           ts            |       sum(current)        |
+======================================================
+ 2018-10-03 14:38:00.000 |              10.300000191 |
+ 2018-10-03 14:38:10.000 |              24.900000572 |
+Query OK, 2 row(s) in set (0.000883s)
+```
+
+The down sampling operation is also applicable to STables, such as summing the current values collected by all smart meters in Beijing every second.
+
+```mysql
+taos> SELECT SUM(current) FROM meters where location like "Beijing%" INTERVAL(1s);
+           ts            |       sum(current)        |
+======================================================
+ 2018-10-03 14:38:04.000 |              10.199999809 |
+ 2018-10-03 14:38:05.000 |              32.900000572 |
+ 2018-10-03 14:38:06.000 |              11.500000000 |
+ 2018-10-03 14:38:15.000 |              12.600000381 |
+ 2018-10-03 14:38:16.000 |              36.000000000 |
+Query OK, 5 row(s) in set (0.001538s)
+```
+
+The down sampling operation also supports time offset, such as summing the current values collected by all smart meters every second, but requires each time window to start from 500 milliseconds.
+
+```mysql
+taos> SELECT SUM(current) FROM meters INTERVAL(1s, 500a);
+           ts            |       sum(current)        |
+======================================================
+ 2018-10-03 14:38:04.500 |              11.189999809 |
+ 2018-10-03 14:38:05.500 |              31.900000572 |
+ 2018-10-03 14:38:06.500 |              11.600000000 |
+ 2018-10-03 14:38:15.500 |              12.300000381 |
+ 2018-10-03 14:38:16.500 |              35.000000000 |
+Query OK, 5 row(s) in set (0.001521s)
+```
+
+In a scenario of IoT, it is difficult to synchronize the time stamp of collected data at each point, but many analysis algorithms (such as FFT) need to align the collected data strictly at equal intervals of time. In many systems, it’s required to write their own programs to process, but the down sampling operation of TDengine can be easily solved. If there is no collected data in an interval, TDengine also provides interpolation calculation function.
+
+For details of syntax rules, please refer to the [Time-dimension Aggregation section of TAOS SQL](https://www.taosdata.com/en/documentation/taos-sql#aggregation).
\ No newline at end of file
diff --git a/documentation20/en/07.advanced-features/docs.md b/documentation20/en/07.advanced-features/docs.md
new file mode 100644
index 0000000000000000000000000000000000000000..cebbb4a269047b956359252bbdb71fb1a4ba8ff8
--- /dev/null
+++ b/documentation20/en/07.advanced-features/docs.md
@@ -0,0 +1,360 @@
+# Advanced Features
+
+## <a class="anchor" id="continuous-query"></a> Continuous Query
+
+Continuous Query is a query executed by TDengine periodically with a sliding window, it is a simplified stream computing driven by timers. Continuous query can be applied to a table or a STable automatically and periodically, and the result set can be passed to the application directly via call back function, or written into a new table in TDengine. The query is always executed on a specified time window (window size is specified by parameter interval), and this window slides forward while time flows (the sliding period is specified by parameter sliding).
+
+Continuous query of TDengine adopts time-driven mode, which can be defined directly by TAOS SQL without additional operation. Using continuous query, results can be generated conveniently and quickly according to the time window, thus down sampling the original collected data. After the user defines a continuous query through TAOS SQL, TDengine automatically pulls up the query at the end of the last complete time period and pushes the calculated results to the user or writes them back to TDengine.
+
+The continuous query provided by TDengine differs from the time window calculation in ordinary stream computing in the following ways:
+
+- Unlike the real-time feedback calculated results of stream computing, continuous query only starts calculation after the time window is closed. For example, if the time period is 1 day, the results of that day will only be generated after 23:59:59.
+- If a history record is written to the time interval that has been calculated, the continuous query will not recalculate and will not push the results to the user again. For the mode of writing back to TDengine, the existing calculated results will not be updated.
+- Using the mode of continuous query pushing results, the server does not cache the client's calculation status, nor does it provide Exactly-Once semantic guarantee. If the user's application side crashed, the continuous query pulled up again would only recalculate the latest complete time window from the time pulled up again. If writeback mode is used, TDengine can ensure the validity and continuity of data writeback.
+
+### How to use continuous query
+
+The following is an example of the smart meter scenario to introduce the specific use of continuous query. Suppose we create a STables and sub-tables through the following SQL statement:
+
+```sql
+create table meters (ts timestamp, current float, voltage int, phase float) tags (location binary(64), groupdId int);
+create table D1001 using meters tags ("Beijing.Chaoyang", 2);
+create table D1002 using meters tags ("Beijing.Haidian", 2);
+...
+```
+
+We already know that the average voltage of these meters can be counted with one minute as the time window and 30 seconds as the forward increment through the following SQL statement.
+
+```sql
+select avg(voltage) from meters interval(1m) sliding(30s);
+```
+
+Every time this statement is executed, all data will be recalculated. If you need to execute every 30 seconds to incrementally calculate the data of the latest minute, you can improve the above statement as following, using a different `startTime` each time and executing it regularly:
+
+```sql
+select avg(voltage) from meters where ts > {startTime} interval(1m) sliding(30s);
+```
+
+There is no problem with this, but TDengine provides a simpler method, just add `create table {tableName} as` before the initial query statement, for example:
+
+```sql
+create table avg_vol as select avg(voltage) from meters interval(1m) sliding(30s);
+```
+
+A new table named `avg_vol` will be automatically created, and then every 30 seconds, TDengine will incrementally execute the SQL statement after `as` and write the query result into this table. The user program only needs to query the data from `avg_vol`. For example:
+
+```mysql
+taos> select * from avg_vol;
+            ts           |        avg_voltage_    |
+===================================================
+ 2020-07-29 13:37:30.000 |            222.0000000 |
+ 2020-07-29 13:38:00.000 |            221.3500000 |
+ 2020-07-29 13:38:30.000 |            220.1700000 |
+ 2020-07-29 13:39:00.000 |            223.0800000 |
+```
+
+It should be noted that the minimum value of the query time window is 10 milliseconds, and there is no upper limit of the time window range.
+
+In addition, TDengine also supports users to specify the starting and ending times of a continuous query. If the start time is not entered, the continuous query will start from the time window where the first original data is located; If no end time is entered, the continuous query will run permanently; If the user specifies an end time, the continuous query stops running after the system time reaches the specified time. For example, a continuous query created with the following SQL will run for one hour and then automatically stop.
+
+```mysql
+create table avg_vol as select avg(voltage) from meters where ts > now and ts <= now + 1h interval(1m) sliding(30s);
+```
+
+It should be noted that now in the above example refers to the time when continuous queries are created, not the time when queries are executed, otherwise, queries cannot be stopped automatically. In addition, in order to avoid the problems caused by delayed writing of original data as much as possible, there is a certain delay in the calculation of continuous queries in TDengine. In other words, after a time window has passed, TDengine will not immediately calculate the data of this window, so it will take a while (usually not more than 1 minute) to find the calculation result.
+
+### Manage the Continuous Query
+
+Users can view all continuous queries running in the system through the show streams command in the console, and can kill the corresponding continuous queries through the kill stream command. Subsequent versions will provide more finer-grained and convenient continuous query management commands.
+
+## <a class="anchor" id="subscribe"></a> Publisher/Subscriber
+
+Based on the natural time-series characteristics of data, the data insert of TDengine is logically consistent with the data publish (pub) of messaging system, which can be regarded as a new record inserted with timestamp in the system. At the same time, TDengine stores data in strict accordance with the monotonous increment of time-series. Essentially, every table in TDengine can be regarded as a standard messaging queue.
+
+TDengine supports embedded lightweight message subscription and publishment services. Using the API provided by the system, users can subscribe to one or more tables in the database using common query statements. The maintenance of subscription logic and operation status is completed by the client. The client regularly polls the server for whether new records arrive, and the results will be fed back to the client when new records arrive.
+
+The status of the subscription and publishment services of TDengine is maintained by the client, but not by the TDengine server. Therefore, if the application restarts, it is up to the application to decide from which point of time to obtain the latest data.
+
+In TDengine, there are three main APIs relevant to subscription:
+
+```c
+taos_subscribe
+taos_consume
+taos_unsubscribe
+```
+
+Please refer to the [C/C++ Connector](https://www.taosdata.com/cn/documentation/connector/) for the documentation of these APIs. The following is still a smart meter scenario as an example to introduce their specific usage (please refer to the previous section "Continuous Query" for the structure of STables and sub-tables). The complete sample code can be found [here](https://github.com/taosdata/TDengine/blob/master/tests/examples/c/subscribe.c).
+
+If we want to be notified and do some process when the current of a smart meter exceeds a certain limit (e.g. 10A), there are two methods: one is to query each sub-table separately, record the timestamp of the last piece of data after each query, and then only query all data after this timestamp:
+
+```sql
+select * from D1001 where ts > {last_timestamp1} and current > 10;
+select * from D1002 where ts > {last_timestamp2} and current > 10;
+...
+```
+
+This is indeed feasible, but as the number of meters increases, the number of queries will also increase, and the performance of both the client and the server will be affected, until the system cannot afford it.
+
+Another method is to query the STable. In this way, no matter how many meters there are, only one query is required:
+
+```sql
+select * from meters where ts > {last_timestamp} and current > 10;
+```
+
+However, how to choose `last_timestamp` has become a new problem. Because, on the one hand, the time of data generation (the data timestamp) and the time of data storage are generally not the same, and sometimes the deviation is still very large; On the other hand, the time when the data of different meters arrive at TDengine will also vary. Therefore, if we use the timestamp of the data from the slowest meter as `last_timestamp` in the query, we may repeatedly read the data of other meters; If the timestamp of the fastest meter is used, the data of other meters may be missed.
+
+The subscription function of TDengine provides a thorough solution to the above problem.
+
+First, use `taos_subscribe` to create a subscription:
+
+```c
+TAOS_SUB* tsub = NULL;
+if (async) {
+　　// create an asynchronized subscription, the callback function will be called every 1s
+　　tsub = taos_subscribe(taos, restart, topic, sql, subscribe_callback, &blockFetch, 1000);
+} else {
+　　// create an synchronized subscription, need to call 'taos_consume' manually
+　　tsub = taos_subscribe(taos, restart, topic, sql, NULL, NULL, 0);
+}
+```
+
+Subscriptions in TDengine can be either synchronous or asynchronous, and the above code will decide which method to use based on the value of parameter `async` obtained from the command line. Here, synchronous means that the user program calls `taos_consume` directly to pull data, while asynchronous means that the API calls `taos_consume` in another internal thread, and then gives the pulled data to the callback function `subscribe_callback` for processing.
+
+Parameter `taos` is an established database connection and has no special requirements in synchronous mode. However, in asynchronous mode, it should be noted that it will not be used by other threads, otherwise it may lead to unpredictable errors, because the callback function is called in the internal thread of the API, while some APIs of TDengine are not thread-safe.
+
+Parameter `sql` is a query statement in which you can specify filters using where clause. In our example, if you only want to subscribe to data when the current exceeds 10A, you can write as follows:
+
+```sql
+select * from meters where current > 10;
+```
+
+Note that the starting time is not specified here, so the data of all timers will be read. If you only want to start subscribing from the data one day ago and do not need earlier historical data, you can add a time condition:
+
+```sql
+select * from meters where ts > now - 1d and current > 10;
+```
+
+The `topic` of the subscription is actually its name, because the subscription function is implemented in the client API, so it is not necessary to ensure that it is globally unique, but it needs to be unique on a client machine.
+
+If the subscription of name `topic` does not exist, the parameter restart is meaningless; However, if the user program exits after creating this subscription, when it starts again and reuses this `topic`, `restart` will be used to decide whether to read data from scratch or from the previous location. In this example, if `restart` is **true** (non-zero value), the user program will definitely read all the data. However, if this subscription exists before, and some data has been read, and `restart` is **false** (zero), the user program will not read the previously read data.
+
+The last parameter of `taos_subscribe` is the polling period in milliseconds. In synchronous mode, if the interval between the two calls to `taos_consume` is less than this time, `taos_consume` will block until the interval exceeds this time. In asynchronous mode, this time is the minimum time interval between two calls to the callback function.
+
+The penultimate parameter of `taos_subscribe` is used by the user program to pass additional parameters to the callback function, which is passed to the callback function as it is without any processing by the subscription API. This parameter is meaningless in sync mode.
+
+After created, the subscription can consume data. In synchronous mode, the sample code is the following as the `else` section:
+
+```c
+if (async) {
+　　getchar();
+} else while(1) {
+　　TAOS_RES* res = taos_consume(tsub);
+　　if (res == NULL) {
+　　　　printf("failed to consume data.");
+　　　　break;
+　　} else {
+　　　　print_result(res, blockFetch);
+　　　　getchar();
+　　}
+}
+```
+
+Here is a **while** loop. Every time the user presses the Enter key, `taos_consume` is called, and the return value of `taos_consume` is the query result set, which is exactly the same as `taos_use_result`. In the example, the code using this result set is the function `print_result`:
+
+```c
+void print_result(TAOS_RES* res, int blockFetch) {
+　　TAOS_ROW row = NULL;
+　　int num_fields = taos_num_fields(res);
+　　TAOS_FIELD* fields = taos_fetch_fields(res);
+　　int nRows = 0;
+　　if (blockFetch) {
+　　　　nRows = taos_fetch_block(res, &row);
+　　　　for (int i = 0; i < nRows; i++) {
+　　　　　　char temp[256];
+　　　　　　taos_print_row(temp, row + i, fields, num_fields);
+　　　　　　puts(temp);
+　　　　}
+　　} else {
+　　　　while ((row = taos_fetch_row(res))) {
+　　　　　　char temp[256];
+　　　　　　taos_print_row(temp, row, fields, num_fields);puts(temp);
+　　　　　　nRows++;
+　　　　}
+　　}
+　　printf("%d rows consumed.\n", nRows);
+}
+```
+
+Among them, `taos_print_row` is used to process subscription to data. In our example, it will print out all eligible records. In asynchronous mode, it is simpler to consume subscribed data:
+
+```c
+void subscribe_callback(TAOS_SUB* tsub, TAOS_RES *res, void* param, int code) {
+　　print_result(res, *(int*)param);
+}
+```
+
+To end a data subscription, you need to call `taos_unsubscribe`:
+
+```c
+taos_unsubscribe(tsub, keep);
+```
+
+Its second parameter is used to decide whether to keep the progress information of subscription on the client. If this parameter is **false** (zero), the subscription can only be restarted no matter what the `restart` parameter is when `taos_subscribe` is called next time. In addition, progress information is saved in the directory {DataDir}/subscribe/. Each subscription has a file with the same name as its `topic`. Deleting a file will also lead to a new start when the corresponding subscription is created next time.
+
+After introducing the code, let's take a look at the actual running effect. For exmaple:
+
+- Sample code has been downloaded locally
+- TDengine has been installed on the same machine
+- All the databases, STables and sub-tables required by the example have been created
+
+You can compile and start the sample program by executing the following command in the directory where the sample code is located:
+
+```shell
+$ make
+$ ./subscribe -sql='select * from meters where current > 10;'
+```
+
+After the sample program starts, open another terminal window, and the shell that starts TDengine inserts a data with a current of 12A into **D1001**:
+
+```shell
+$ taos
+> use test;
+> insert into D1001 values(now, 12, 220, 1);
+```
+
+At this time, because the current exceeds 10A, you should see that the sample program outputs it to the screen. You can continue to insert some data to observe the output of the sample program.
+
+### Use data subscription in Java
+
+The subscription function also provides a Java development interface, as described in [Java Connector](https://www.taosdata.com/cn/documentation/connector/). It should be noted that the Java interface does not provide asynchronous subscription mode at present, but user programs can achieve the same feature by creating  TimerTask.
+
+The following is an example to introduce its specific use. The function it completes is basically the same as the C language example described earlier, and it is also to subscribe to all records with current exceeding 10A in the database.
+
+#### Prepare data
+
+```sql
+# Create power Database
+taos> create database power;
+# Switch to the database
+taos> use power;
+# Create a STable
+taos> create table meters(ts timestamp, current float, voltage int, phase int) tags(location binary(64), groupId int);
+# Create tables
+taos> create table d1001 using meters tags ("Beijing.Chaoyang", 2);
+taos> create table d1002 using meters tags ("Beijing.Haidian", 2);
+# Insert test data
+taos> insert into d1001 values("2020-08-15 12:00:00.000", 12, 220, 1),("2020-08-15 12:10:00.000", 12.3, 220, 2),("2020-08-15 12:20:00.000", 12.2, 220, 1);
+taos> insert into d1002 values("2020-08-15 12:00:00.000", 9.9, 220, 1),("2020-08-15 12:10:00.000", 10.3, 220, 1),("2020-08-15 12:20:00.000", 11.2, 220, 1);
+# Query all records with current over 10A from STable meters
+taos> select * from meters where current > 10;
+           ts            |    current   |    voltage   |  phase |         location          |   groupid   |
+===========================================================================================================
+ 2020-08-15 12:10:00.000 |    10.30000  |     220      |      1 |      Beijing.Haidian      |           2 |
+ 2020-08-15 12:20:00.000 |    11.20000  |     220      |      1 |      Beijing.Haidian      |           2 |
+ 2020-08-15 12:00:00.000 |    12.00000  |     220      |      1 |      Beijing.Chaoyang     |           2 |
+ 2020-08-15 12:10:00.000 |    12.30000  |     220      |      2 |      Beijing.Chaoyang     |           2 |
+ 2020-08-15 12:20:00.000 |    12.20000  |     220      |      1 |      Beijing.Chaoyang     |           2 |
+Query OK, 5 row(s) in set (0.004896s)
+```
+
+#### Example
+
+```java
+public class SubscribeDemo {
+    private static final String topic = "topic-meter-current-bg-10";
+    private static final String sql = "select * from meters where current > 10";
+
+    public static void main(String[] args) {
+        Connection connection = null;
+        TSDBSubscribe subscribe = null;
+
+        try {
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+            Properties properties = new Properties();
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+            String jdbcUrl = "jdbc:TAOS://127.0.0.1:6030/power?user=root&password=taosdata";
+            connection = DriverManager.getConnection(jdbcUrl, properties);
+            subscribe = ((TSDBConnection) connection).subscribe(topic, sql, true); // Create a subscription
+            int count = 0;
+            while (count < 10) {
+                TimeUnit.SECONDS.sleep(1); / Wait 1 second to avoid calling consume too frequently and causing pressure on server
+                TSDBResultSet resultSet = subscribe.consume(); // 消费数据
+                if (resultSet == null) {
+                    continue;
+                }
+                ResultSetMetaData metaData = resultSet.getMetaData();
+                while (resultSet.next()) {
+                    int columnCount = metaData.getColumnCount();
+                    for (int i = 1; i <= columnCount; i++) {
+                        System.out.print(metaData.getColumnLabel(i) + ": " + resultSet.getString(i) + "\t");
+                    }
+                    System.out.println();
+                    count++;
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if (null != subscribe)
+                    subscribe.close(true); // Close the subscription
+                if (connection != null) 
+                    connection.close(); 
+            } catch (SQLException throwables) {
+                throwables.printStackTrace();
+            }
+        }
+    }
+}
+```
+
+Run the sample program. First, it consumes all the historical data that meets the query conditions:
+
+```shell
+# java -jar subscribe.jar 
+
+ts: 1597464000000	current: 12.0	voltage: 220	phase: 1	location: Beijing.Chaoyang	groupid : 2
+ts: 1597464600000	current: 12.3	voltage: 220	phase: 2	location: Beijing.Chaoyang	groupid : 2
+ts: 1597465200000	current: 12.2	voltage: 220	phase: 1	location: Beijing.Chaoyang	groupid : 2
+ts: 1597464600000	current: 10.3	voltage: 220	phase: 1	location: Beijing.Haidian	groupid : 2
+ts: 1597465200000	current: 11.2	voltage: 220	phase: 1	location: Beijing.Haidian	groupid : 2
+```
+
+Then, add a piece of data to the table via taos client:
+
+```sql
+# taos
+taos> use power;
+taos> insert into d1001 values("2020-08-15 12:40:00.000", 12.4, 220, 1);
+```
+
+Because the current of this data is greater than 10A, the sample program will consume it:
+
+```shell
+ts: 1597466400000	current: 12.4	voltage: 220	phase: 1	location: Beijing.Chaoyang	groupid: 2
+```
+
+## <a class="anchor" id="cache"></a> Cache
+
+TDengine adopts a time-driven cache management strategy (First-In-First-Out, FIFO), also known as a write-driven cache management mechanism. This strategy is different from the read-driven data cache mode (Least-Recent-Use, LRU), which directly saves the most recently written data in the system buffer. When the buffer reaches a threshold, the oldest data is written to disk in batches. Generally speaking, for the use of IoT data, users are most concerned about the recently generated data, that is, the current status. TDengine takes full advantage of this feature by storing the most recently arrived (current status) data in the buffer.
+
+TDengine provides data collection in milliseconds to users through query functions. Saving the recently arrived data directly in buffer can respond to the user's query analysis for the latest piece or batch of data more quickly, and provide faster database query response as a whole. In this way, TDengine can be used as a data buffer by setting appropriate configuration parameters without deploying additional caching systems, which can effectively simplify the system architecture and reduce the operation costs. It should be noted that after the TDengine is restarted, the buffer of the system will be emptied, the previously cached data will be written to disk in batches, and the cached data will not reload the previously cached data into the buffer like some proprietary Key-value cache system.
+
+TDengine allocates a fixed size of memory space as a buffer, which can be configured according to application requirements and hardware resources. By properly setting the buffer space, TDengine can provide extremely high-performance write and query support. Each virtual node in TDengine is allocated a separate cache pool when it is created. Each virtual node manages its own cache pool, and different virtual nodes do not share the pool. All tables belonging to each virtual node share the cache pool owned by itself.
+
+TDengine manages the memory pool by blocks, and the data is stored in the form of rows within. The memory pool of a vnode is allocated by blocks when the vnode is created, and each memory block is managed according to the First-In-First-Out strategy. When creating a memory pool, the size of the blocks is determined by the system configuration parameter cache; The number of memory blocks in each vnode is determined by the configuration parameter blocks. So for a vnode, the total memory size is: cache * blocks. A cache block needs to ensure that each table can store at least dozens of records in order to be efficient.
+
+You can quickly obtain the last record of a table or a STable through the function last_row, which is very convenient to show the real-time status or collected values of each device on a large screen. For example:
+
+```mysql
+select last_row(voltage) from meters where location='Beijing.Chaoyang';
+```
+
+This SQL statement will obtain the last recorded voltage value of all smart meters located in Chaoyang District, Beijing.
+
+## <a class="anchor" id="alert"></a> Alert
+
+In scenarios of TDengine, alarm monitoring is a common requirement. Conceptually, it requires the program to filter out data that meet certain conditions from the data of the latest period of time, and calculate a result according to a defined formula based on these data. When the result meets certain conditions and lasts for a certain period of time, it will notify the user in some form.
+
+In order to meet the needs of users for alarm monitoring, TDengine provides this function in the form of an independent module. For its installation and use, please refer to the blog [How to Use TDengine for Alarm Monitoring](https://www.taosdata.com/blog/2020/04/14/1438.html).
\ No newline at end of file
diff --git a/documentation20/en/08.connector/docs.md b/documentation20/en/08.connector/docs.md
new file mode 100644
index 0000000000000000000000000000000000000000..9913a2958f3b9d1cb981b623533e1b494bf88823
--- /dev/null
+++ b/documentation20/en/08.connector/docs.md
@@ -0,0 +1,1039 @@
+# Connectors
+
+TDengine provides many connectors for development, including C/C++, JAVA, Python, RESTful, Go, Node.JS, etc.
+
+![image-connector](page://images/connector.png)
+
+At present, TDengine connectors support a wide range of platforms, including hardware platforms such as X64/X86/ARM64/ARM32/MIPS/Alpha, and development environments such as Linux/Win64/Win32. The comparison matrix is as follows:
+
+| **CPU**     | **X64 64bit** | **X64 64bit** | **X64 64bit** | **X86 32bit** | **ARM64** | **ARM32** | **MIPS Godson** | **Alpha Whenwei** | **X64 TimecomTech** |
+| ----------- | ------------- | ------------- | ------------- | ------------- | --------- | --------- | --------------- | ----------------- | ------------------- |
+| **OS**      | **Linux**     | **Win64**     | **Win32**     | **Win32**     | **Linux** | **Linux** | **Linux**       | **Linux**         | **Linux**           |
+| **C/C++**   | ●             | ●             | ●             | ○             | ●         | ●         | ○               | ○                 | ○                   |
+| **JDBC**    | ●             | ●             | ●             | ○             | ●         | ●         | ○               | ○                 | ○                   |
+| **Python**  | ●             | ●             | ●             | ○             | ●         | ●         | ○               | --                | ○                   |
+| **Go**      | ●             | ●             | ●             | ○             | ●         | ●         | ○               | --                | --                  |
+| **NodeJs**  | ●             | ●             | ○             | ○             | ●         | ●         | ○               | --                | --                  |
+| **C#**      | ○             | ●             | ●             | ○             | ○         | ○         | ○               | --                | --                  |
+| **RESTful** | ●             | ●             | ●             | ●             | ●         | ●         | ○               | ○                 | ○                   |
+
+Note: ● stands for that has been verified by official tests; ○ stands for that has been verified by unofficial tests. 
+
+Note:
+
+- To access the TDengine database through connectors (except RESTful) in the system without TDengine server software, it is necessary to install the corresponding version of the client installation package to make the application driver (the file name is [libtaos.so](http://libtaos.so/) in Linux system and taos.dll in Windows system) installed in the system, otherwise, the error that the corresponding library file cannot be found will occur.
+- All APIs that execute SQL statements, such as `tao_query`, `taos_query_a`, `taos_subscribe` in C/C + + Connector, and APIs corresponding to them in other languages, can only execute one SQL statement at a time. If the actual parameters contain multiple statements, their behavior is undefined.
+- Users upgrading to TDengine 2.0. 8.0 must update the JDBC connection. TDengine must upgrade taos-jdbcdriver to 2.0.12 and above.
+- No matter which programming language connector is selected, TDengine version 2.0 and above recommends that each thread of database application establish an independent connection or establish a connection pool based on threads to avoid mutual interference between threads of "USE statement" state variables in the connection (but query and write operations of the connection are thread-safe).
+
+## <a class="anchor" id="driver"></a> Steps of Connector Driver Installation
+
+The server should already have the TDengine server package installed. The connector driver installation steps are as follows:
+
+**Linux**
+
+**1. Download from TAOS Data website(https://www.taosdata.com/cn/all-downloads/)**
+
+* X64 hardware environment: TDengine-client-2.x.x.x-Linux-x64.tar.gz
+* ARM64 hardware environment: TDengine-client-2.x.x.x-Linux-aarch64.tar.gz
+* ARM32 hardware environment: TDengine-client-2.x.x.x-Linux-aarch32.tar.gz
+
+**2. Unzip the package**
+
+Place the package in any directory that current user can read/write, and then execute following command:
+
+`tar -xzvf TDengine-client-xxxxxxxxx.tar.gz`
+
+Where xxxxxx needs to be replaced with you actual version as a string.
+
+**3. Execute installation script**
+
+After extracting the package, you will see the following files (directories) in the extracting directory:
+
+*install_client. sh*: Installation script for application driver
+
+*taos.tar.gz*: Application driver installation package 
+
+*driver*: TDengine application driver 
+
+*connector*: Connectors for various programming languages (go/grafanaplugin/nodejs/python/JDBC) 
+
+*Examples*: Sample programs for various programming languages (C/C #/go/JDBC/matlab/python/R)
+
+Run install_client.sh to install.
+
+**4. Configure taos.cfg**
+
+Edit the taos.cfg file (default path/etc/taos/taos.cfg) and change firstEP to End Point of the TDengine server, for example: [h1.taos.com](http://h1.taos.com/):6030.
+
+**Tip: If no TDengine service deployed in this machine, but only the application driver is installed, only firstEP needs to be configured in taos.cfg, and FQDN does not.**
+
+**Windows x64/x86**
+
+**1. Download from TAOS Data website(https://www.taosdata.com/cn/all-downloads/)**
+
+* X64 hardware environment: TDengine-client-2.X.X.X-Windows-x64.exe
+* X86 hardware environment: TDengine-client-2.X.X.X-Windows-x86.exe
+
+**2. Execute installation, select default vales as prompted to complete**
+
+**3. Installatino path**
+
+Default installation path is: C:\TDengine, with following files(directories):
+
+*taos.exe*: taos shell command line program
+
+*cfg*: configuration file directory 
+
+*driver*: application driver dynamic link library 
+
+*examples*: sample program bash/C/C #/go/JDBC/Python/Node.js 
+
+*include*: header file 
+
+*log*: log file 
+
+*unins000. exe*: uninstall program
+
+**4. Configure taos.cfg**
+
+Edit the taos.cfg file (default path/etc/taos/taos.cfg) and change firstEP to End Point of the TDengine server, for example: [h1.taos.com](http://h1.taos.com/):6030.
+
+**Note:**
+
+**1. If you use FQDN to connect to the server, you must confirm that the DNS of the local network environment has been configured, or add FQDN addressing records in the hosts file. For example, edit C:\ Windows\ system32\ drivers\ etc\ hosts, and add the following record: 192.168. 1.99 [h1.taos.com](http://h1.taos.com/)**
+
+**2. Uninstall: Run unins000. exe to uninstall the TDengine application driver.**
+
+**Installation verification**
+
+After the above installation and configuration completed, and confirm that the TDengine service has started running normally, the taos client can be logged in at this time.
+
+**Linux environment:**
+
+If you execute taos directly under Linux shell, you should be able to connect to tdengine service normally and jump to taos shell interface. For Example:
+
+```mysql
+$ taos     
+Welcome to the TDengine shell from Linux, Client  Version:2.0.5.0  
+Copyright (c) 2017 by TAOS Data, Inc. All rights  reserved.     
+taos> show databases;           
+name       |   created_time    |   ntables  |  vgroups   | replica | quorum | days |    keep1,keep2,keep(D)   | cache(MB)|   blocks  |  minrows   |  maxrows  | wallevel |  fsync    | comp | precision |    status  |  
+=========================================================================================================================================================================================================================  
+test       | 2020-10-14  10:35:48.617 |     10 |      1 |    1 |   1 |     2 | 3650,3650,3650        |     16|      6 |     100 |    4096 |    1 |    3000 |  2 | ms      | ready    |   
+log        | 2020-10-12  09:08:21.651 |      4 |      1 |    1 |   1 |   10 | 30,30,30               |      1|      3 |     100 |    4096 |    1 |    3000 |  2 | us    | ready    |  
+Query OK, 2 row(s) in set (0.001198s)     
+taos>  
+```
+
+**Windows (x64/x86) environment:**
+
+Under cmd, enter the c:\ tdengine directory and directly execute taos.exe, and you should be able to connect to tdengine service normally and jump to taos shell interface. For example:
+
+```mysql
+  C:\TDengine>taos     
+  Welcome to the TDengine  shell from Linux, Client Version:2.0.5.0  
+  Copyright (c) 2017 by  TAOS Data, Inc. All rights reserved.     
+  taos> show  databases;         
+  name       |   created_time    |   ntables  |  vgroups   | replica | quorum | days |    keep1,keep2,keep(D)   | cache(MB)   |  blocks  |   minrows  |  maxrows   | wallevel |  fsync  | comp | precision |  status    |  
+  ===================================================================================================================================================================================================================================================================   
+  test       | 2020-10-14  10:35:48.617 |     10 |      1 |    1 |   1 |     2 | 3650,3650,3650        |     16 |      6 |     100 |    4096 |    1 |    3000 |  2 | ms    | ready    |   
+  log        | 2020-10-12  09:08:21.651 |      4 |      1 |    1 |   1 |    10 | 30,30,30              |      1 |      3 |     100 |    4096 |    1 |    3000 |  2 | us    | ready    |  
+  Query OK, 2 row(s) in  set (0.045000s)     
+  taos>  
+```
+
+## <a class="anchor" id="c-cpp"></a> C/C++ Connector
+
+**Systems supported by C/C++ connectors as follows:**
+
+| **CPU Type**         | **x64****（****64bit****）** |         |         | **ARM64** | **ARM32**          |
+| -------------------- | ---------------------------- | ------- | ------- | --------- | ------------------ |
+| **OS Type**          | Linux                        | Win64   | Win32   | Linux     | Linux              |
+| **Supported or Not** | Yes                          | **Yes** | **Yes** | **Yes**   | **In development** |
+
+The C/C + + API is similar to MySQL's C API. When application use it, it needs to include the TDengine header file taos.h (after installed, it is located in/usr/local/taos/include):
+
+```C
+#include <taos.h>
+```
+
+Note:
+
+- The TDengine dynamic library needs to be linked at compiling. The library in Linux is [libtaos.so](http://libtaos.so/), which installed at/usr/local/taos/driver. By Windows, it is taos.dll and installed at C:\ TDengine.
+- Unless otherwise specified, when the return value of API is an integer, 0 represents success, others are error codes representing the cause of failure, and when the return value is a pointer, NULL represents failure.
+
+More sample codes for using C/C++ connectors, please visit https://github.com/taosdata/TDengine/tree/develop/tests/examples/c.
+
+### Basic API
+
+The basic API is used to create database connections and provide a runtime environment for the execution of other APIs.
+
+- `void taos_init()`
+
+Initialize the running environment. If the application does not actively call the API, the API will be automatically called when the application call taos_connect, so the application generally does not need to call the API manually.
+
+- `void taos_cleanup()`
+
+Clean up the running environment and call this API before the application exits.
+
+- `int taos_options(TSDB_OPTION option, const void * arg, ...)`
+
+Set client options, currently only time zone setting (_TSDB_OPTIONTIMEZONE) and encoding setting (_TSDB_OPTIONLOCALE) are supported. The time zone and encoding default to the current operating system settings.
+
+- `char *taos_get_client_info()`
+
+Get version information of the client.
+
+- `TAOS *taos_connect(const char *host, const char *user, const char *pass, const char *db, int port)`
+
+Create a database connection and initialize the connection context. The parameters that need to be provided by user include:
+
+* host: FQDN used by TDengine to manage the master node
+* user: User name
+* pass: Password
+* db: Database name. If user does not provide it, it can be connected normally, means user can create a new database through this connection. If user provides a database name, means the user has created the database and the database is used by default
+* port: Port number
+
+A null return value indicates a failure. The application needs to save the returned parameters for subsequent API calls.
+
+- `char *taos_get_server_info(TAOS *taos)`
+
+Get version information of the server-side.
+
+- `int taos_select_db(TAOS *taos, const char *db)`
+
+Set the current default database to db.
+
+- `void taos_close(TAOS *taos)`
+
+Close the connection, where `taos` is the pointer returned by `taos_connect` function.
+
+### Synchronous query API
+
+Traditional database operation APIs all make synchronous operations. After the application calls an API, it remains blocked until the server returns the result. TDengine supports the following APIs:
+
+- `TAOS_RES* taos_query(TAOS *taos, const char *sql)`
+
+This API is used to execute SQL statements, which can be DQL, DML or DDL statements. Where `taos` parameter is a pointer obtained through `taos_connect`. You can't judge whether the execution result fails by whether the return value is NULL, but to use `taos_errno` function to parse the error code in the result set.
+
+- `int taos_result_precision(TAOS_RES *res)`
+
+The precision of the timestamp field in the returned result set, `0` for milliseconds, `1` for microseconds, and `2` for nanoseconds.
+
+- `TAOS_ROW taos_fetch_row(TAOS_RES *res)`
+
+Get the data in the query result set by rows.
+
+- `int taos_fetch_block(TAOS_RES *res, TAOS_ROW *rows)`
+
+The data in the query result set is obtained in batch, and the return value is the number of rows of the obtained data.
+
+- `int taos_num_fields(TAOS_RES *res)` 和 `int taos_field_count(TAOS_RES *res)`
+
+The two APIs are equivalent, and are used to get the number of columns in the query result set.
+
+- `int* taos_fetch_lengths(TAOS_RES *res)`
+
+Get the length of each field in the result set. The return value is an array whose length is the number of columns in the result set.
+
+- `int taos_affected_rows(TAOS_RES *res)`
+
+Get the number of rows affected by the executed SQL statement.
+
+- `TAOS_FIELD *taos_fetch_fields(TAOS_RES *res)`
+
+Get the attributes (data type, name, number of bytes) of each column of data in the query result set, which can be used in conjunction with `taos_num_files` to parse the data of a tuple (one row) returned by `taos_fetch_row`. The structure of `TAOS_FIELD` is as follows:
+
+```c
+typedef struct taosField {
+  char     name[65];  // Column name
+  uint8_t  type;      // Data type
+  int16_t  bytes;     // Number of bytes
+} TAOS_FIELD;
+```
+
+- `void taos_stop_query(TAOS_RES *res)`
+
+Stop the execution of a query.
+
+- `void taos_free_result(TAOS_RES *res)`
+
+Release the query result set and related resources. After the query is completed, be sure to call the API to release resources, otherwise it may lead to application memory leakage. However, it should also be noted that after releasing resources, if you call functions such as `taos_consume` to obtain query results, it will lead the application to Crash.
+
+- `char *taos_errstr(TAOS_RES *res)`
+
+Get the reason why the last API call failed, and the return value is a string.
+
+- `char *taos_errno(TAOS_RES *res)`
+
+Get the reason why the last API call failed, and the return value is the error code.
+
+**Note:** TDengine 2.0 and above recommends that each thread of a database application establish an independent connection or establish a connection pool based on threads. It is not recommended to pass the connection (TAOS\*) structure to different threads for sharing in applications. Query and write operations based on TAOS structure have multithread safety, but state variables such as "USE statement" may interfere with each other among threads. In addition, C connector can dynamically establish new database-oriented connections according to requirements (this process is not visible to users), and it is recommended to call `taos_close` to close the connection only when the program finally exits.
+
+### Asynchronous query API
+
+In addition to synchronous API, TDengine also provides higher performance asynchronous call API to handle data insertion and query operations. Under the same software and hardware environment, asynchronous API processes data insertion 2 ~ 4 times faster than synchronous API. Asynchronous API adopts a non-blocking call mode and returns immediately before the system really completes a given database operation. The calling thread can handle other work, thus improving the performance of the whole application. Asynchronous API has outstanding advantages in the case of poor network delay.
+
+Asynchronous APIs all need applications to provide corresponding callback function. The callback function parameters are set as follows: the first two parameters are consistent, and the third parameter depends on different APIs. The first parameter param is provided to the system when the application calls the asynchronous API. When used for callback, the application can retrieve the context of the specific operation, depending on the specific implementation. The second parameter is the result set of SQL operation. If it is empty, such as insert operation, it means that there is no record returned. If it is not empty, such as select operation, it means that there is record returned.
+
+Asynchronous APIs have relatively high requirements for users, who can selectively use them according to specific application scenarios. Here are three important asynchronous APIs:
+
+- `void taos_query_a(TAOS *taos, const char *sql, void (*fp)(void *param, TAOS_RES *, int code), void *param);`
+   Execute SQL statement asynchronously.
+
+   * taos: The database connection returned by calling `taos_connect`
+   * sql: The SQL statement needed to execute
+   * fp: User-defined callback function, whose third parameter `code` is used to indicate whether the operation is successful, `0` for success, and negative number for failure (call `taos_errstr` to get the reason for failure). When defining the callback function, it mainly handles the second parameter `TAOS_RES *`, which is the result set returned by the query
+  * param：the parameter for the callback
+
+- `void taos_fetch_rows_a(TAOS_RES *res, void (*fp)(void *param, TAOS_RES *, int numOfRows), void *param);`
+  Get the result set of asynchronous queries in batch, which can only be used with `taos_query_a`. Within:
+
+  * res: The result set returned when backcall `taos_query_a`
+  * fp: Callback function. Its parameter `param` is a user-definable parameter construct passed to the callback function; `numOfRows` is the number of rows of data obtained (not a function of the entire query result set). In the callback function, applications can get each row of the batch records by calling `taos_fetch_rows` forward iteration. After reading all the records in a block, the application needs to continue calling `taos_fetch_rows_a` in the callback function to obtain the next batch of records for processing until the number of records returned (`numOfRows`) is zero (the result is returned) or the number of records is negative (the query fails).
+
+The asynchronous APIs of TDengine all use non-blocking calling mode. Applications can use multithreading to open multiple tables at the same time, and can query or insert to each open table at the same time. It should be pointed out that the **application client must ensure that the operation on the same table is completely serialized**, that is, when the insertion or query operation on the same table is not completed (when no result returned), the second insertion or query operation cannot be performed.
+
+
+
+<a class="anchor" id="stmt"></a>
+
+### Parameter binding API
+
+In addition to calling `taos_query` directly for queries, TDengine also provides a Prepare API that supports parameter binding. Like MySQL, these APIs currently only support using question mark `?` to represent the parameters to be bound, as follows:
+
+- `TAOS_STMT* taos_stmt_init(TAOS *taos)`
+
+Create a `TAOS_STMT` object for calling later.
+
+- `int taos_stmt_prepare(TAOS_STMT *stmt, const char *sql, unsigned long length)`
+
+Parse a SQL statement and bind the parsing result and parameter information to STMT. If the parameter length is greater than 0, this parameter will be used as the length of the SQL statement. If it is equal to 0, the length of the SQL statement will be automatically judged.
+
+- `int taos_stmt_bind_param(TAOS_STMT *stmt, TAOS_BIND *bind)`
+
+For parameter binding, bind points to an array, and it is necessary to ensure that the number and order of elements in this array are exactly the same as the parameters in sql statement. TAOS_BIND is used in the same way as MYSQL_BIND in MySQL and is defined as follows:
+
+```c
+typedef struct TAOS_BIND {
+  int            buffer_type;
+  void *         buffer;
+  unsigned long  buffer_length;  // Not in use
+  unsigned long *length;
+  int *          is_null;
+  int            is_unsigned;    // Not in use
+  int *          error;          // Not in use
+} TAOS_BIND;
+```
+
+Add the curren bound parameters to the batch. After calling this function, you can call `taos_stmt_bind_param` again to bind the new parameters. It should be noted that this function only supports insert/import statements, and if it is other SQL statements such as select, it will return errors.
+
+- `int taos_stmt_execute(TAOS_STMT *stmt)`
+
+Execute the prepared statement. At the moment, a statement can only be executed once.
+
+- `TAOS_RES* taos_stmt_use_result(TAOS_STMT *stmt)`
+
+Gets the result set of the statement. The result set is used in the same way as when calling nonparameterized. After using it, `taos_free_result` should be called to release resources.
+
+- `int taos_stmt_close(TAOS_STMT *stmt)`
+
+Execution completed, release all resources.
+
+### Continuous query interface
+
+TDengine provides time-driven real-time stream computing APIs. You can perform various real-time aggregation calculation operations on tables (data streams) of one or more databases at regular intervals. The operation is simple, only APIs for opening and closing streams. The details are as follows:
+
+- `TAOS_STREAM *taos_open_stream(TAOS *taos, const char *sql, void (*fp)(void *param, TAOS_RES *, TAOS_ROW row), int64_t stime, void *param, void (*callback)(void *))`
+
+This API is used to create data streams where:
+
+  * taos: Database connection established
+  * sql: SQL query statement (query statement only)
+  * fp: user-defined callback function pointer. After each stream computing is completed, TDengine passes the query result (TAOS_ROW), query status (TAOS_RES), and user-defined parameters (PARAM) to the callback function. In the callback function, the user can use taos_num_fields to obtain the number of columns in the result set, and taos_fetch_fields to obtain the type of data in each column of the result set.
+  * stime: The time when stream computing starts. If it is 0, it means starting from now. If it is not zero, it means starting from the specified time (the number of milliseconds from 1970/1/1 UTC time).
+  * param: It is a parameter provided by the application for callback. During callback, the parameter is provided to the application
+  * callback: The second callback function is called when the continuous query stop automatically.
+
+The return value is NULL, indicating creation failed; the return value is not NULL, indicating creation successful.
+
+- `void taos_close_stream (TAOS_STREAM *tstr)`
+
+Close the data flow, where the parameter provided is the return value of `taos_open_stream`. When the user stops stream computing, be sure to close the data flow.
+
+### Data subscription interface
+
+The subscription API currently supports subscribing to one or more tables and continuously obtaining the latest data written to the tables through regular polling.
+
+- `TAOS_SUB *taos_subscribe(TAOS* taos, int restart, const char* topic, const char *sql, TAOS_SUBSCRIBE_CALLBACK fp, void *param, int interval)`
+
+This function is for starting the subscription service, returning the subscription object in case of success, and NULL in case of failure. Its parameters are:
+
+  * taos: Database connection established
+  * Restart: If the subscription already exists, do you want to start over or continue with the previous subscription
+  * Topic: Subject (that is, name) of the subscription. This parameter is the unique identification of the subscription
+  * sql: The query statement subscribed. This statement can only be a select statement. It should only query the original data, and can only query the data in positive time sequence
+  * fp: The callback function when the query result is received (the function prototype will be introduced later). It is only used when calling asynchronously, and this parameter should be passed to NULL when calling synchronously
+  * param: The additional parameter when calling the callback function, which is passed to the callback function as it is by the system API without any processing
+  * interval: Polling period in milliseconds. During asynchronous call, the callback function will be called periodically according to this parameter; In order to avoid affecting system performance, it is not recommended to set this parameter too small; When calling synchronously, if the interval between two calls to taos_consume is less than this period, the API will block until the interval exceeds this period.
+
+- `typedef void (*TAOS_SUBSCRIBE_CALLBACK)(TAOS_SUB* tsub, TAOS_RES *res, void* param, int code)`
+
+In asynchronous mode, the prototype of the callback function has the following parameters:
+
+  * tsub: Subscription object
+  * res: Query the result set. Note that there may be no records in the result set
+  * param: Additional parameters supplied by the client when  `taos_subscribe` is called
+  * code: Error code
+
+- `TAOS_RES *taos_consume(TAOS_SUB *tsub)`
+
+In synchronous mode, this function is used to get the results of subscription. The user application places it in a loop. If the interval between two calls to `taos_consume` is less than the polling cycle of the subscription, the API will block until the interval exceeds this cycle. If a new record arrives in the database, the API will return the latest record, otherwise it will return an empty result set with no records. If the return value is NULL, it indicates a system error. In asynchronous mode, user program should not call this API.
+
+- `void taos_unsubscribe(TAOS_SUB *tsub, int keepProgress)`
+
+Unsubscribe. If the parameter `keepProgress` is not 0, the API will keep the progress information of subscription, and the subsequent call to `taos_subscribe` can continue based on this progress; otherwise, the progress information will be deleted and the data can only be read again.
+
+## <a class="anchor" id="python"></a>Python Connector
+
+See [video tutorials](https://www.taosdata.com/blog/2020/11/11/1963.html) for the use of Python connectors.
+
+### Installation preparation
+
+- For application driver installation, please refer to [steps of connector driver installation](https://www.taosdata.com/en/documentation/connector#driver)
+- python 2.7 or >= 3.4 installed
+- pip or pip3 installed
+
+### Python client installation
+
+#### Linux
+
+Users can find the connector package for python2 and python3 in the source code src/connector/python (or tar.gz/connector/python) folder. Users can install it through `pip` command:
+
+`pip install src/connector/python/linux/python2/`
+
+or
+
+ `pip3 install src/connector/python/linux/python3/`
+
+#### Windows
+
+With Windows TDengine client installed, copy the file "C:\TDengine\driver\taos.dll" to the "C:\ windows\ system32" directory and enter the Windows <em>cmd</em> command line interface:
+
+```cmd
+cd C:\TDengine\connector\python
+python -m pip install .
+```
+
+- If there is no `pip` command on the machine, the user can copy the taos folder under src/connector/python to the application directory for use. For Windows client, after installing the TDengine Windows client, copy C:\ TDengine\driver\taos.dll to the C:\ windows\ system32 directory.
+
+### How to use
+
+#### Code sample
+
+- Import the TDengine client module
+
+```python
+import taos
+```
+
+- Get the connection and cursor object
+
+```python
+conn = taos.connect(host="127.0.0.1", user="root", password="taosdata", config="/etc/taos")
+c1 = conn.cursor()
+```
+
+- *host* covers all IPs of TDengine server-side, and *config* is the directory where the client configuration files is located
+- Write data
+
+```python
+import datetime
+
+# Create a database
+c1.execute('create database db')
+c1.execute('use db')
+# Create a table
+c1.execute('create table tb (ts timestamp, temperature int, humidity float)')
+# Insert data
+start_time = datetime.datetime(2019, 11, 1)
+affected_rows = c1.execute('insert into tb values (\'%s\', 0, 0.0)' %start_time)
+# Insert data in batch
+time_interval = datetime.timedelta(seconds=60)
+sqlcmd = ['insert into tb values']
+for irow in range(1,11):
+  start_time += time_interval
+  sqlcmd.append('(\'%s\', %d, %f)' %(start_time, irow, irow*1.2))
+affected_rows = c1.execute(' '.join(sqlcmd))
+```
+
+- Query data
+
+```python
+c1.execute('select * from tb')
+# pull query result
+data = c1.fetchall()
+# The result is a list, with each row as an element
+numOfRows = c1.rowcount
+numOfCols = len(c1.description)
+for irow in range(numOfRows):
+  print("Row%d: ts=%s, temperature=%d, humidity=%f" %(irow, data[irow][0], data[irow][1],data[irow][2]))
+
+# Use cursor loop directly to pull query result
+c1.execute('select * from tb')
+for data in c1:
+  print("ts=%s, temperature=%d, humidity=%f" %(data[0], data[1],data[2]))
+```
+
+- Create subscription
+
+```python
+# Create a subscription with the topic ‘test’ and a consumption cycle of 1000 milliseconds
+# If the first parameter is True, it means restarting the subscription. If it is False and a subscription with the topic 'test 'has been created before, it means continuing to consume the data of this subscription instead of restarting to consume all the data
+sub = conn.subscribe(True, "test", "select * from tb;", 1000)
+```
+
+- Consume subscription data
+
+```python
+data = sub.consume()
+for d in data:
+    print(d)
+```
+
+- Unsubscription
+
+```python
+sub.close()
+```
+
+- Close connection
+
+```python
+c1.close()
+conn.close()
+```
+
+#### Helper
+
+Users can directly view the usage information of the module through Python's helper, or refer to the sample program in tests/examples/Python. The following are some common classes and methods:
+
+- *TDengineConnection* class
+
+Refer to help (taos.TDEngineConnection) in python. This class corresponds to a connection between the client and TDengine. In the scenario of client multithreading, it is recommended that each thread apply for an independent connection instance, but not recommended that multiple threads share a connection.
+
+- *TDegnineCursor* class
+
+Refer to help (taos.TDengineCursor) in python. This class corresponds to the write and query operations performed by the client. In the scenario of client multithreading, this cursor instance must be kept exclusive to threads and cannot be used by threads, otherwise errors will occur in the returned results.
+
+- *connect* method
+
+Used to generate an instance of taos.TDengineConnection.
+
+### Python client code sample
+
+In tests/examples/python, we provide a sample Python program read_example. py to guide you to design your own write and query program. After installing the corresponding client, introduce the taos class through `import taos`. The steps are as follows:
+
+- Get the `TDengineConnection` object through `taos.connect`, which can be applied for only one by a program and shared among multiple threads.
+
+- Get a new cursor object through the `.cursor ()` method of the `TDengineConnection` object, which must be guaranteed to be exclusive to each thread.
+
+- Execute SQL statements for writing or querying through the `execute()` method of the cursor object.
+
+- If a write statement is executed, `execute` returns the number of rows successfully written affected rows.
+
+- If the query statement is executed, the result set needs to be pulled through the fetchall method after the execution is successful. 
+
+  You can refer to the sample code for specific methods.
+
+## <a class="anchor" id="restful"></a> RESTful Connector
+
+To support the development of various types of platforms, TDengine provides an API that conforms to REST design standards, that is, RESTful API. In order to minimize the learning cost, different from other designs of database RESTful APIs, TDengine directly requests SQL statements contained in BODY through HTTP POST to operate the database, and only needs a URL. See the [video tutorial](https://www.taosdata.com/blog/2020/11/11/1965.html) for the use of RESTful connectors.
+
+###  HTTP request format
+
+```
+http://<ip>:<PORT>/rest/sql
+```
+
+Parameter description:
+
+- IP: Any host in the cluster
+- PORT: httpPort configuration item in the configuration file, defaulting to 6041
+
+For example: [http://192.168.0.1](http://192.168.0.1/): 6041/rest/sql is a URL that points to an IP address of 192.168. 0.1.
+
+The header of HTTP request needs to carry identity authentication information. TDengine supports Basic authentication and custom authentication. Subsequent versions will provide standard and secure digital signature mechanism for identity authentication.
+
+- Custom identity authentication information is as follows (We will introduce <token> later)
+
+```
+Authorization: Taosd <TOKEN>
+```
+
+- Basic identity authentication information is as follows
+
+```
+Authorization: Basic <TOKEN>
+```
+
+The BODY of HTTP request is a complete SQL statement. The data table in the SQL statement should provide a database prefix, such as \<db-name>.\<tb-name>. If the table name does not have a database prefix, the system returns an error. Because the HTTP module is just a simple forwarding, there is no current DB concept.
+
+Use curl to initiate an HTTP Request through custom authentication. The syntax is as follows:
+
+```bash
+curl -H 'Authorization: Basic <TOKEN>' -d '<SQL>' <ip>:<PORT>/rest/sql
+```
+
+or
+
+```bash
+curl -u username:password -d '<SQL>' <ip>:<PORT>/rest/sql
+```
+
+Where `TOKEN` is the string of `{username}:{password}` encoded by Base64, for example, `root:taosdata` will be encoded as `cm9vdDp0YW9zZGF0YQ==`.
+
+### HTTP return format
+
+The return value is in JSON format, as follows:
+
+```json
+{
+    "status": "succ",
+    "head": ["ts","current", …],
+    "column_meta": [["ts",9,8],["current",6,4], …],
+    "data": [
+        ["2018-10-03 14:38:05.000", 10.3, …],
+        ["2018-10-03 14:38:15.000", 12.6, …]
+    ],
+    "rows": 2
+} 
+```
+
+Description:
+
+- status: Informs whether the operation results are successful or failed.
+- head: The definition of the table, with only one column "affected_rows" if no result set is returned. (Starting from version 2.0. 17, it is recommended not to rely on the head return value to judge the data column type, but to use column_meta. In future versions, head may be removed from the return value.)
+- column_meta: Starting with version 2.0. 17, this item is added to the return value to indicate the data type of each column in the data. Each column will be described by three values: column name, column type and type length. For example, ["current", 6, 4] means that the column name is "current"; the column type is 6, that is, float type; the type length is 4, which corresponds to a float represented by 4 bytes. If the column type is binary or nchar, the type length indicates the maximum content length that the column can save, rather than the specific data length in this return value. When the column type is nchar, its type length indicates the number of Unicode characters that can be saved, not bytes.
+- data: The specific returned data, rendered line by line, if no result set is returned, then only [[affected_rows]]. The order of the data columns for each row in data is exactly the same as the order of the data columns described in column_meta.
+- rows: Indicates the total number of rows of data.
+
+Column types in column_meta:
+
+* 1：BOOL
+* 2：TINYINT
+* 3：SMALLINT
+* 4：INT
+* 5：BIGINT
+* 6：FLOAT
+* 7：DOUBLE
+* 8：BINARY
+* 9：TIMESTAMP
+* 10：NCHAR
+
+### Custom authorization code
+
+The HTTP request requires the authorization code `<TOKEN>` for identification. Authorization codes are usually provided by administrators. Authorization codes can be obtained simply by sending `HTTP GET` requests as follows:
+
+```bash
+curl http://<ip>:6041/rest/login/<username>/<password>
+```
+
+Where `ip` is the IP address of the TDengine database, `username` is the database user name, `password` is the database password, and the return value is in `JSON` format. The meanings of each field are as follows:
+
+- status: flag bit for request result
+- code: code of return value
+- desc: Authorization code
+
+Sample to get authorization code:
+
+```bash
+curl http://192.168.0.1:6041/rest/login/root/taosdata
+```
+
+Return value:
+
+```json
+{
+  "status": "succ",
+  "code": 0,
+  "desc": "/KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04"
+}
+```
+
+### Use case
+
+- Lookup all records of table d1001 in demo database:
+
+```bash
+curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'select * from demo.d1001' 192.168.0.1:6041/rest/sql
+```
+
+Return value:
+
+```json
+{
+    "status": "succ",
+    "head": ["ts","current","voltage","phase"],
+    "column_meta": [["ts",9,8],["current",6,4],["voltage",4,4],["phase",6,4]],
+    "data": [
+        ["2018-10-03 14:38:05.000",10.3,219,0.31],
+        ["2018-10-03 14:38:15.000",12.6,218,0.33]
+    ],
+    "rows": 2
+}
+```
+
+- Craete a database demo:
+
+```bash
+curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'create database demo' 192.168.0.1:6041/rest/sql
+```
+
+Return value:
+
+```json
+{
+    "status": "succ",
+    "head": ["affected_rows"],
+    "column_meta": [["affected_rows",4,4]],
+    "data": [[1]],
+    "rows": 1
+}
+```
+
+### Other cases
+
+### Result set in Unix timestamp
+
+When the HTTP request URL is sqlt, the timestamp of the returned result set will be expressed in Unix timestamp format, for example:
+
+```bash
+curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'select * from demo.d1001' 192.168.0.1:6041/rest/sqlt
+```
+
+Return value:
+
+```json
+{
+    "status": "succ",
+    "head": ["ts","current","voltage","phase"],
+    "column_meta": [["ts",9,8],["current",6,4],["voltage",4,4],["phase",6,4]],
+    "data": [
+        [1538548685000,10.3,219,0.31],
+        [1538548695000,12.6,218,0.33]
+    ],
+    "rows": 2
+}
+```
+
+#### Result set in UTC time string
+
+When the HTTP request URL is `sqlutc`, the timestamp of the returned result set will be represented by a UTC time string, for example:
+
+```bash
+  curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'select * from demo.t1' 192.168.0.1:6041/rest/sqlutc
+```
+
+Return value:
+
+```json
+{
+    "status": "succ",
+    "head": ["ts","current","voltage","phase"],
+    "column_meta": [["ts",9,8],["current",6,4],["voltage",4,4],["phase",6,4]],
+    "data": [
+        ["2018-10-03T14:38:05.000+0800",10.3,219,0.31],
+        ["2018-10-03T14:38:15.000+0800",12.6,218,0.33]
+    ],
+    "rows": 2
+}
+```
+
+### Important configuration options
+
+Only some configuration parameters related to RESTful interface are listed below. Please refer to the instructions in the configuration file for other system parameters. Note: After the configuration is modified, the taosd service needs to be restarted before it can take effect.
+
+- httpPort: The port number that provides RESTful services externally, which is bound to 6041 by default
+- httpMaxThreads: The number of threads started, the default is 2 (starting with version 2.0. 17, the default value is changed to half of the CPU cores and rounded down)
+- restfulRowLimit: The maximum number of result sets returned (in JSON format), default 10240
+- httpEnableCompress: Compression is not supported by default. Currently, TDengine only supports gzip compression format
+- httpdebugflag: Logging switch, 131: error and alarm information only, 135: debugging information, 143: very detailed debugging information, default 131
+
+
+
+## <a class="anchor" id="csharp"></a> CSharp Connector
+
+The C # connector supports: Linux 64/Windows x64/Windows x86.
+
+### Installation preparation
+
+- For application driver installation, please refer to the[ steps of installing connector driver](https://www.taosdata.com/en/documentation/connector#driver).
+- . NET interface file TDengineDrivercs.cs and reference sample TDengineTest.cs are both located in the Windows client install_directory/examples/C# directory.
+- On Windows, C # applications can use the native C interface of TDengine to perform all database operations, and future versions will provide the ORM (dapper) framework driver.
+
+### Installation verification
+
+Run install_directory/examples/C#/C#Checker/C#Checker.exe
+
+```cmd
+cd {install_directory}/examples/C#/C#Checker
+csc /optimize *.cs
+C#Checker.exe -h <fqdn>
+```
+
+### How to use C# connector
+
+On Windows system, .NET applications can use the .NET interface of TDengine to perform all database operations. The steps to use it are as follows:
+
+1. Add the. NET interface file TDengineDrivercs.cs to the .NET project where the application is located.
+2. Users can refer to TDengineTest.cs to define database connection parameters and how to perform data insert, query and other operations;
+
+This. NET interface requires the taos.dll file, so before executing the application, copy the taos.dll file in the Windows client install_directory/driver directory to the folder where the. NET project finally generated the .exe executable file. After running the exe file, you can access the TDengine database and do operations such as insert and query.
+
+**Note:**
+
+1. TDengine V2.0. 3.0 supports both 32-bit and 64-bit Windows systems, so when. NET project generates a .exe file, please select the corresponding "X86" or "x64" for the "Platform" under "Solution"/"Project".
+2. This. NET interface has been verified in Visual Studio 2015/2017, and other VS versions have yet to be verified.
+
+### Third-party Driver
+
+Maikebing.Data.Taos is an ADO.Net provider for TDengine that supports Linux, Windows. This development package is provided by enthusiastic contributor 麦壳饼@@maikebing. For more details:
+
+```
+// Download
+https://github.com/maikebing/Maikebing.EntityFrameworkCore.Taos   
+// How to use    
+https://www.taosdata.com/blog/2020/11/02/1901.html                    
+```
+
+## <a class="anchor" id="go"></a> Go Connector
+
+### Installation preparation
+
+- For application driver installation, please refer to the [steps of installing connector driver](https://www.taosdata.com/en/documentation/connector#driver).
+
+The TDengine provides the GO driver taosSql. taosSql implements the GO language's built-in interface database/sql/driver. Users can access TDengine in the application by simply importing the package as follows, see https://github.com/taosdata/driver-go/blob/develop/taosSql/driver_test.go for details.
+
+Sample code for using the Go connector can be found in https://github.com/taosdata/TDengine/tree/develop/tests/examples/go and the [video tutorial](https://www.taosdata.com/blog/2020/11/11/1951.html).
+
+```Go
+import (
+    "database/sql"
+    _ "github.com/taosdata/driver-go/taosSql"
+)
+```
+
+**It is recommended to use Go version 1.13 or above and turn on module support:**
+
+```bash
+go env -w GO111MODULE=on  
+go env -w GOPROXY=https://goproxy.io,direct  
+```
+
+### Common APIs
+
+- `sql.Open(DRIVER_NAME string, dataSourceName string) *DB`
+
+This API is used to open DB and return an object of type \* DB. Generally, DRIVER_NAME is set to the string `taosSql`, and dataSourceName is set to the string `user:password@/tcp(host:port)/dbname`. If the customer wants to access TDengine with multiple goroutines concurrently, it is necessary to create a `sql.Open` object in each goroutine and use it to access TDengine.
+
+**Note**: When the API is successfully created, there is no permission check. Only when Query or Exec is actually executed can the connection be truly created and whether the user/password/host/port is legal can be checked at the same time. In addition, because most of the implementation of the whole driver sinks into libtaos, which taosSql depends on. Therefore, sql.Open itself is particularly lightweight.
+
+- `func (db *DB) Exec(query string, args ...interface{}) (Result, error)`
+
+`sql.Open` built-in method to execute non-query related SQL
+
+- `func (db *DB) Query(query string, args ...interface{}) (*Rows, error)`
+
+`sql.Open` built-in method used to execute query statements
+
+- `func (db *DB) Prepare(query string) (*Stmt, error)`
+
+`sql.Open` built-in method used to create a prepared statement for later queries or executions.
+
+- `func (s *Stmt) Exec(args ...interface{}) (Result, error)`
+
+`sql.Open` built-in method to execute a prepared statement with the given arguments and returns a Result summarizing the effect of the statement.
+
+- `func (s *Stmt) Query(args ...interface{}) (*Rows, error)`
+
+`sql.Open` built-in method to query executes a prepared query statement with the given arguments and returns the query results as a \*Rows.
+
+- `func (s *Stmt) Close() error`
+
+`sql.Open` built-in method to closes the statement.
+
+## <a class="anchor" id="nodejs"></a> Node.js Connector
+
+The Node.js connector supports the following systems:
+
+| **CPU Type**         | x64(64bit）                  |         |         |   aarch64   |   aarch32   |
+| -------------------- | ---------------------------- | ------- | ------- | ----------- | ----------- |
+| **OS Type**          | Linux                        | Win64   | Win32   | Linux       | Linux       |
+| **Supported or Not** | **Yes**                      | **Yes** | **Yes** | **Yes**     | **Yes**     |
+
+See the [video tutorial](https://www.taosdata.com/blog/2020/11/11/1957.html) for use of the Node.js connector.
+
+### Installation preparation
+
+- For application driver installation, please refer to the [steps of installing connector driver](https://www.taosdata.com/en/documentation/connector#driver).
+
+### Install Node.js connector
+
+Users can install it through [npm](https://www.npmjs.com/) or through the source code src/connector/nodejs/. The specific installation steps are as follows:
+
+First, install the node.js connector through [npm](https://www.npmjs.com/).
+
+```bash
+npm install td2.0-connector
+```
+
+We recommend that use npm to install the node.js connector. If you do not have npm installed, you can copy src/connector/nodejs/ to your nodejs project directory.
+
+We use [node-gyp](https://github.com/nodejs/node-gyp) to interact with the TDengine server. Before installing the node.js connector, you also need to install the following software:
+
+### Linux
+
+- python (recommended v2.7, not currently supported in v3.x.x)
+- node 2.0. 6 supports v12. x and v10. x, 2.0. 5 and earlier supports v10. x, and other versions may have package compatibility issues.
+- make
+- [GCC](https://gcc.gnu.org/) and other C compilers
+
+### Windows
+
+#### Solution 1
+
+Use Microsoft [windows-build-tools](https://github.com/felixrieseberg/windows-build-tools) to install all necessary tools by executing npm install --global --production windows-build-tools in cmd command line interface.
+
+#### Solution 2
+
+Mannually install the following tools:
+
+- Install Visual Studio related tools: [Visual Studio Build Tools](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=BuildTools) or [Visual Studio 2017 Community](https://visualstudio.microsoft.com/pl/thank-you-downloading-visual-studio/?sku=Community)
+- Install [Python](https://www.python.org/downloads/) 2.7 (not supported in v3.x.x) and execute npm config set python python2.7
+- Open `cmd`, `npm config set msvs_version 2017`
+
+If the  steps above cannot be performed successfully, you can refer to Microsoft's Node.js User Manual [Microsoft's Node.js Guidelines for Windows](https://github.com/Microsoft/nodejs-guidelines/blob/master/windows-environment.md#compiling-native-addon-modules).
+
+If you use ARM64 Node.js on Windows 10 ARM, you also need to add "Visual C + + compilers and libraries for ARM64" and "Visual C + + ATL for ARM64".
+
+#### Sample
+
+The sample program source code is located in install_directory/examples/nodejs, and there are:
+
+Node-example.js node.js sample source code Node-example-raw. js
+
+### Installation verification
+
+After installing the TDengine client, the nodejsChecker.js program can verify whether the current environment supports access to TDengine via nodejs.
+
+Steps:
+
+1. Create a new installation verification directory, for example: ~/tdengine-test, copy the nodejsChecker.js source program on github. Download address: （https://github.com/taosdata/TDengine/tree/develop/tests/examples/nodejs/nodejsChecker.js）.
+
+2. Execute the following command:
+
+   ```bash
+   npm init -y
+   npm install td2.0-connector
+   node nodejsChecker.js host=localhost
+   ```
+
+3. After performing the above steps, the nodejs connection Tdengine instance will be outputted on the command line, and the short-answer of insertion and query will be executed.
+
+### How to use Node.js
+
+The following are some basic uses of node.js connector. Please refer to [TDengine Node.js connector](http://docs.taosdata.com/node) for details.
+
+### Create connection
+
+When using the node.js connector, you must execute <em>require</em> `td2.0-connector`, and then use the `taos.connect` function. The parameter that `taos.connect` function must provide is `host`, and other parameters will use the following default values if they are not provided. Finally, the `cursor` needs to be initialized to communicate with the TDengine server-side.
+
+```javascript
+const taos = require('td2.0-connector');
+var conn = taos.connect({host:"127.0.0.1", user:"root", password:"taosdata", config:"/etc/taos",port:0})
+var cursor = conn.cursor(); // Initializing a new cursor
+```
+
+To close the connect:
+
+```javascript
+conn.close();
+```
+
+#### To execute SQL and insert data
+
+For DDL statements (such as `create database`, `create table`, `use`, and so on), you can use the `execute` method of `cursor`. The code is as follows:
+
+```js
+cursor.execute('create database if not exists test;')
+```
+
+The above code creates a database named test. For DDL statements, there is generally no return value, and the execute return value of `cursor` is 0.
+
+For Insert statements, the code is as follows:
+
+```js
+var affectRows = cursor.execute('insert into test.weather values(now, 22.3, 34);')
+```
+
+The return value of the execute method is the number of rows affected by the statement. If the sql above inserts a piece of data into the weather table of the test database, the return value affectRows is 1.
+
+TDengine does not currently support update and delete statements.
+
+#### Query
+
+You can query the database through  `cursor.query` function.
+
+```javascript
+var query = cursor.query('show databases;')
+```
+
+The results of the query can be obtained and printed through `query.execute()` function:
+
+```javascript
+var promise = query.execute();
+promise.then(function(result) {
+  result.pretty(); 
+});
+```
+
+You can also use the `bind` method of `query` to format query statements. For example: `query` automatically fills the `?` with the value provided in the query statement .
+
+```javascript
+var query = cursor.query('select * from meterinfo.meters where ts <= ? and areaid = ?;').bind(new Date(), 5);
+query.execute().then(function(result) {
+  result.pretty();
+})
+```
+
+If you provide the second parameter in the `query` statement and set it to `true`, you can also get the query results immediately. As follows:
+
+```javascript
+var promise = cursor.query('select * from meterinfo.meters where v1 = 30;', true)
+promise.then(function(result) {
+  result.pretty();
+})
+```
+
+#### Asynchronous function
+
+The operation of asynchronous query database is similar to the above, only by adding `_a` after `cursor.execute`, `TaosQuery.execute` and other functions.
+
+```javascript
+var promise1 = cursor.query('select count(*), avg(v1), avg(v2) from meter1;').execute_a()
+var promise2 = cursor.query('select count(*), avg(v1), avg(v2) from meter2;').execute_a();
+promise1.then(function(result) {
+  result.pretty();
+})
+promise2.then(function(result) {
+  result.pretty();
+})
+```
+
+### Example
+
+[node-example.js](https://github.com/taosdata/TDengine/tree/master/tests/examples/nodejs/node-example.js) provides a code example that uses the NodeJS connector to create a table, insert weather data, and query the inserted data.
+
+[node-example-raw.js](https://github.com/taosdata/TDengine/tree/master/tests/examples/nodejs/node-example-raw.js) is also a code example that uses the NodeJS connector to create a table, insert weather data, and query the inserted data, but unlike the above, this example only uses cursor.
diff --git a/documentation20/en/09.connections/docs.md b/documentation20/en/09.connections/docs.md
new file mode 100644
index 0000000000000000000000000000000000000000..93633ea369202200d04310fba0af7da8b67d48f5
--- /dev/null
+++ b/documentation20/en/09.connections/docs.md
@@ -0,0 +1,157 @@
+# Connections with Other Tools
+
+## <a class="anchor" id="grafana"></a> Grafana
+
+TDengine can quickly integrate with [Grafana](https://www.grafana.com/), an open source data visualization system, to build a data monitoring and alarming system. The whole process does not require any code to write. The contents of the data table in TDengine can be visually showed on DashBoard.
+
+### Install Grafana
+
+TDengine currently supports Grafana 5.2.4 and above. You can download and install the package from Grafana website according to the current operating system. The download address is as follows:
+
+https://grafana.com/grafana/download.
+
+### Configure Grafana
+
+TDengine Grafana plugin is in the /usr/local/taos/connector/grafanaplugin directory. 
+
+Taking Centos 7.2 as an example, just copy grafanaplugin directory to /var/lib/grafana/plugins directory and restart Grafana.
+
+```bash
+sudo cp -rf /usr/local/taos/connector/grafanaplugin /var/lib/grafana/plugins/tdengine
+```
+
+### Use Grafana
+
+#### Configure data source
+
+You can log in the Grafana server (username/password:admin/admin) through localhost:3000, and add data sources through `Configuration -> Data Sources` on the left panel, as shown in the following figure:
+
+![img](page://images/connections/add_datasource1.jpg)
+
+Click `Add data source` to enter the Add Data Source page, and enter TDengine in the query box to select Add, as shown in the following figure:
+
+![img](page://images/connections/add_datasource2.jpg)
+
+Enter the data source configuration page and modify the corresponding configuration according to the default prompt:
+
+![img](page://images/connections/add_datasource3.jpg)
+
+- Host: IP address of any server in TDengine cluster and port number of TDengine RESTful interface (6041), default  [http://localhost:6041](http://localhost:6041/)
+- User: TDengine username.
+- Password: TDengine user password.
+
+Click `Save & Test` to test. Success will be prompted as follows:
+
+![img](page://images/connections/add_datasource4.jpg)
+
+#### Create Dashboard
+
+Go back to the home  to create Dashboard, and click `Add Query` to enter the panel query page:
+
+![img](page://images/connections/create_dashboard1.jpg)
+
+As shown in the figure above, select the TDengine data source in Query, and enter the corresponding sql in the query box below to query. Details are as follows:
+
+- INPUT SQL: Enter the statement to query (the result set of the SQL statement should be two columns and multiple rows), for example: `select avg(mem_system) from log.dn where ts >= $from and ts < $to interval($interval)` , where `from`, `to` and `interval` are built-in variables of the TDengine plug-in, representing the query range and time interval obtained from the Grafana plug-in panel. In addition to built-in variables, it is also supported to use custom template variables.
+- ALIAS BY: You can set alias for the current queries.
+- GENERATE SQL: Clicking this button will automatically replace the corresponding variable and generate the final statement to execute.
+
+According to the default prompt, query the average system memory usage at the specified interval of the server where the current TDengine deployed in as follows:
+
+![img](page://images/connections/create_dashboard2.jpg)
+
+> Please refer to Grafana [documents](https://grafana.com/docs/) for how to use Grafana to create the corresponding monitoring interface and for more about Grafana usage.
+
+#### Import Dashboard
+
+A `tdengine-grafana.json` importable dashboard is provided under the Grafana plug-in directory/usr/local/taos/connector/grafana/tdengine/dashboard/.
+
+Click the `Import` button on the left panel and upload the  `tdengine-grafana.json` file:
+
+![img](page://images/connections/import_dashboard1.jpg)
+
+You can see as follows after Dashboard imported.
+
+![img](page://images/connections/import_dashboard2.jpg)
+
+## <a class="anchor" id="matlab"></a> Matlab
+
+MatLab can access data to the local workspace by connecting directly to the TDengine via the JDBC Driver provided in the installation package.
+
+### JDBC Interface Adaptation of MatLab
+
+Several steps are required to adapt Matlab to TDengine. Taking adapting Matlab2017a on Windows10 as an example:
+
+- Copy the file JDBCDriver-1.0.0-dist.ja*r* in TDengine package to the directory ${matlab_root}\MATLAB\R2017a\java\jar\toolbox
+- Copy the file taos.lib in TDengine package to ${matlab root dir}\MATLAB\R2017a\lib\win64
+- Add the .jar package just copied to the Matlab classpath. Append the line below as the end of the file of ${matlab root dir}\MATLAB\R2017a\toolbox\local\classpath.txt
+- ```
+  $matlabroot/java/jar/toolbox/JDBCDriver-1.0.0-dist.jar
+  ```
+
+- Create a file called javalibrarypath.txt in directory ${user_home}\AppData\Roaming\MathWorks\MATLAB\R2017a_, and add the _taos.dll path in the file. For example, if the file taos.dll is in the directory of C:\Windows\System32，then add the following line in file javalibrarypath.txt:
+- ```
+  C:\Windows\System32
+  ```
+
+- ### Connect to TDengine in MatLab to get data
+
+After the above configured successfully, open MatLab.
+
+- Create a connection:
+
+```matlab
+conn = database(‘db’, ‘root’, ‘taosdata’, ‘com.taosdata.jdbc.TSDBDriver’, ‘jdbc:TSDB://127.0.0.1:0/’)
+```
+
+* Make a query:
+
+```matlab
+sql0 = [‘select * from tb’]
+data = select(conn, sql0);
+```
+
+* Insert a record:
+
+```matlab
+sql1 = [‘insert into tb values (now, 1)’]
+exec(conn, sql1)
+```
+
+For more detailed examples, please refer to the examples\Matlab\TDEngineDemo.m file in the package.
+
+## <a class="anchor" id="r"></a> R 
+
+R language supports connection to the TDengine database through the JDBC interface. First, you need to install the JDBC package of R language. Launch the R language environment, and then execute the following command to install the JDBC support library for R language:
+
+```R
+install.packages('RJDBC', repos='http://cran.us.r-project.org')
+```
+
+After installed, load the RJDBC package by executing `library('RJDBC')` command.
+
+Then load the TDengine JDBC driver:
+
+```R
+drv<-JDBC("com.taosdata.jdbc.TSDBDriver","JDBCDriver-2.0.0-dist.jar", identifier.quote="\"")
+```
+
+If succeed, no error message will display. Then use the following command to try a database connection:
+
+```R
+conn<-dbConnect(drv,"jdbc:TSDB://192.168.0.1:0/?user=root&password=taosdata","root","taosdata")
+```
+
+Please replace the IP address in the command above to the correct one. If no error message is shown, then the connection is established successfully, otherwise the connection command needs to be adjusted according to the error prompt. TDengine supports below functions in *RJDBC* package:
+
+- `dbWriteTable(conn, "test", iris, overwrite=FALSE, append=TRUE)`: Write the data in a data frame iris to the table test in the TDengine server. Parameter overwrite must be false. append must be TRUE and the schema of the data frame iris should be the same as the table test.
+- `dbGetQuery(conn, "select count(*) from test")`: run a query command
+- `dbSendUpdate (conn, "use db")`: Execute any non-query sql statement. For example, `dbSendUpdate (conn, "use db")`, write data `dbSendUpdate (conn, "insert into t1 values (now, 99)")`, and the like.
+- `dbReadTable(conn, "test")`: read all the data in table test
+- `dbDisconnect(conn)`: close a connection
+- `dbRemoveTable(conn, "test")`: remove table test
+
+The functions below are not supported currently:
+
+- `dbExistsTable(conn, "test")`: if table test exists
+- `dbListTables(conn)`: list all tables in the connection
\ No newline at end of file
diff --git a/documentation20/en/10.cluster/docs.md b/documentation20/en/10.cluster/docs.md
new file mode 100644
index 0000000000000000000000000000000000000000..d7d908ff424270d9aa33f89eefd36e73f6ab68b2
--- /dev/null
+++ b/documentation20/en/10.cluster/docs.md
@@ -0,0 +1,235 @@
+# TDengine Cluster Management
+
+Multiple TDengine servers, that is, multiple running instances of taosd, can form a cluster to ensure the highly reliable operation of TDengine and provide scale-out features. To understand cluster management in TDengine 2.0, it is necessary to understand the basic concepts of clustering. Please refer to the chapter "Overall Architecture of TDengine 2.0". And before installing the cluster, please follow the chapter ["Getting started"](https://www.taosdata.com/en/documentation/getting-started/) to install and experience the single node function.
+
+Each data node of the cluster is uniquely identified by End Point, which is composed of FQDN (Fully Qualified Domain Name) plus Port, such as [h1.taosdata.com](http://h1.taosdata.com/):6030. The general FQDN is the hostname of the server, which can be obtained through the Linux command `hostname -f` (how to configure FQDN, please refer to: [All about FQDN of TDengine](https://www.taosdata.com/blog/2020/09/11/1824.html)). Port is the external service port number of this data node. The default is 6030, but it can be modified by configuring the parameter serverPort in taos.cfg. A physical node may be configured with multiple hostnames, and TDengine will automatically get the first one, but it can also be specified through the configuration parameter fqdn in taos.cfg. If you are accustomed to direct IP address access, you can set the parameter fqdn to the IP address of this node.
+
+The cluster management of TDengine is extremely simple. Except for manual intervention in adding and deleting nodes, all other tasks are completed automatically, thus minimizing the workload of operation. This chapter describes the operations of cluster management in detail.
+
+Please refer to the [video tutorial](https://www.taosdata.com/blog/2020/11/11/1961.html) for cluster building.
+
+## <a class="anchor" id="prepare"></a> Preparation
+
+**Step 0:** Plan FQDN of all physical nodes in the cluster, and add the planned FQDN to /etc/hostname of each physical node respectively; modify the /etc/hosts of each physical node, and add the corresponding IP and FQDN of all cluster physical nodes. [If DNS is deployed, contact your network administrator to configure it on DNS]
+
+**Step 1:** If the physical nodes have previous test data, installed with version 1. x, or installed with other versions of TDengine, please delete it first and drop all data. For specific steps, please refer to the blog "[Installation and Uninstallation of Various Packages of TDengine](https://www.taosdata.com/blog/2019/08/09/566.html)"
+
+**Note 1:** Because the information of FQDN will be written into a file, if FQDN has not been configured or changed before, and TDengine has been started, be sure to clean up the previous data （`rm -rf /var/lib/taos/*`）on the premise of ensuring that the data is useless or backed up;
+
+**Note 2:** The client also needs to be configured to ensure that it can correctly parse the FQDN configuration of each node, whether through DNS service or Host file.
+
+**Step 2:** It is recommended to close the firewall of all physical nodes, and at least ensure that the TCP and UDP ports of ports 6030-6042 are open. It is **strongly recommended** to close the firewall first and configure the ports after the cluster is built;
+
+**Step 3:** Install TDengine on all physical nodes, and the version must be consistent, **but do not start taosd**. During installation, when prompted to enter whether to join an existing TDengine cluster, press enter for the first physical node directly to create a new cluster, and enter the FQDN: port number (default 6030) of any online physical node in the cluster for the subsequent physical nodes;
+
+**Step 4:** Check the network settings of all data nodes and the physical nodes where the application is located:
+
+1. Execute command `hostname -f` on each physical node, and check and confirm that the hostnames of all nodes are different (the node where the application driver is located does not need to do this check).
+2. Execute `ping host` on each physical node, wherein host is that hostname of other physical node, and see if other physical nodes can be communicated to; if not, you need to check the network settings, or the /etc/hosts file (the default path for Windows systems is C:\ Windows\ system32\ drivers\ etc\ hosts), or the configuration of DNS. If it fails to ping, then we cann't build the cluster. 
+3. From the physical node where the application runs, ping the data node where taosd runs. If the ping fails, the application cannot connect to taosd. Please check the DNS settings or hosts file of the physical node where the application is located;
+4. The End Point of each data node is the output hostname plus the port number, for example, [h1.taosdata.com](http://h1.taosdata.com/): 6030
+
+**Step 5:** Modify the TDengine configuration file (the file/etc/taos/taos.cfg for all nodes needs to be modified). Assume that the first data node End Point to be started is [h1.taosdata.com](http://h1.taosdata.com/): 6030, and its parameters related to cluster configuration are as follows:
+
+```
+// firstEp is the first data node connected after each data node’s first launch
+firstEp        h1.taosdata.com:6030
+// Must configure it as the FQDN of this data node. If this machine has only one hostname, you can comment out this configuration
+fqdn         h1.taosdata.com  
+// Configure the port number of this data node, the default is 6030
+serverPort      6030
+// For application scenarios, please refer to the section “Use of Arbitrator”
+arbitrator      ha.taosdata.com:6042
+```
+
+The parameters that must be modified are firstEp and fqdn. At each data node, every firstEp needs to be configured to be the same, **but fqdn must be configured to the value of the data node where it is located**. Other parameters may not be modified unless you have clear reasons.
+
+**The data node dnode added to the cluster must be exactly the same as the 11 parameters in the following table related to the cluster, otherwise it cannot be successfully added to the cluster.**
+
+
+
+| **#** | **Configuration Parameter Name** | **Description**                                              |
+| ----- | -------------------------------- | ------------------------------------------------------------ |
+| 1     | numOfMnodes                      | Number of management nodes in system                         |
+| 2     | mnodeEqualVnodeNum               | A mnode equals to the number of vnodes consumed              |
+| 3     | offlineThreshold                 | Offline threshold of dnode to judge if the dnode is offline  |
+| 4     | statusInterval                   | The interval for dnode to report its status to mnode         |
+| 5     | arbitrator                       | The end point of the arbitrator in system                    |
+| 6     | timezone                         | Time zone                                                    |
+| 7     | locale                           | Location information and coding format of system             |
+| 8     | charset                          | Character set encoding                                       |
+| 9     | balance                          | Whether to start load balancing                              |
+| 10    | maxTablesPerVnode                | The maximum number of tables that can be created in each vnode |
+| 11    | maxVgroupsPerDb                  | The maximum number of vgroups that can be used per DB        |
+
+## <a class="anchor" id="node-one"></a> Launch the First Data Node
+
+Follow the instructions in "[Getting started](https://www.taosdata.com/en/documentation/getting-started/)", launch the first data node, such as [h1.taosdata.com](http://h1.taosdata.com/), then execute taos, start the taos shell, and execute command "show dnodes" from the shell; ", as follows:
+
+```
+Welcome to the TDengine shell from Linux, Client Version:2.0.0.0
+Copyright (c) 2017 by TAOS Data, Inc. All rights reserved.
+
+taos> show dnodes;
+ id |       end_point    | vnodes | cores | status | role |      create_time        |
+=====================================================================================
+  1 |  h1.taos.com:6030  |      0 |     2 |  ready |  any | 2020-07-31 03:49:29.202 |
+Query OK, 1 row(s) in set (0.006385s)
+
+taos>
+```
+
+In the above command, you can see that the End Point of the newly launched data node is: [h1.taos.com](http://h1.taos.com/): 6030, which is the firstEP of the new cluster.
+
+## <a class="anchor" id="node-other"></a>Launch Subsequent Data Nodes
+
+To add subsequent data nodes to the existing cluster, there are the following steps:
+
+1. Start taosd at each physical node according to the chapter "[Getting started](https://www.taosdata.com/en/documentation/getting-started/)";
+
+2. On the first data node, use CLI program taos to log in to TDengine system and execute the command:
+
+    ```
+      CREATE DNODE "h2.taos.com:6030"; 
+    ```
+
+Add the End Point of the new data node (learned in Step 4 of the preparation) to the cluster's EP list. **"fqdn: port" needs to be enclosed in double quotation marks**, otherwise an error will occur. Notice that the example "[h2.taos.com](http://h2.taos.com/): 6030" is replaced with the End Point for this new data node.
+
+3. And then execute the command
+
+1. ```
+      SHOW DNODES;
+   ```
+
+2. Check to see if the new node was successfully joined. If the added data node is offline, then check:
+
+1. - Check whether the taosd of this data node is working properly. If it is not working properly, you need to check the reason first
+   - Check the first few lines of the data node taosd log file taosdlog.0 (usually in the /var/log/taos directory) to see if the data node fqdn and port number output in the log are the just added End Point. If not, you need to add the correct End Point.
+
+According to the above steps, new data nodes can be continuously added to the cluster.
+
+**Tips**:
+
+- Any data node that has joined the cluster online can be used as the firstEP of the subsequent node to be joined.
+- firstEp is only effective when the data node joins the cluster for the first time. After joining the cluster, the data node will save the latest End Point list of mnode and no longer rely on this parameter.
+- The two dnode data nodes dnode that are not configured with the firstEp parameter will run independently after startup. At this time, one data node cannot be added to another data node to form a cluster. **You cannot merge two independent clusters into a new cluster**.
+
+## <a class="anchor" id="management"></a> Data Node Management
+
+The above has already introduced how to build clusters from scratch. After the cluster is formed, new data nodes can be added at any time for expansion, or data nodes can be deleted, and the current status of the cluster can be checked.
+
+### Add data nodes
+
+Execute CLI program taos, log in to the system using root account, and execute:
+
+```
+CREATE DNODE "fqdn:port"; 
+```
+
+Add the End Point for the new data node to the cluster's EP list. **"fqdn: port" needs to be enclosed in double quotation marks**, otherwise an error will occur. The fqdn and port of a data node's external service can be configured through the configuration file taos.cfg, which is automatically obtained by default. [It is strongly not recommended to configure FQDN with automatic acquisition, which may cause the End Point of the generated data node to be not expected]
+
+### Delete data nodes
+
+Execute the CLI program taos, log in to the TDengine system using the root account, and execute:
+
+```
+DROP DNODE "fqdn:port";
+```
+
+Where fqdn is the FQDN of the deleted node, and port is the port number of its external server.
+
+<font color=green>**【Note】**</font>
+
+- Once a data node is dropped, it cannot rejoin the cluster. This node needs to be redeployed (emptying the data folder). The cluster migrates the data from the dnode before it completes the drop dnode operation.
+- Note that dropping a dnode and stopping the taosd process are two different concepts. Don't be confused: the data migration operation must be performed before deleting a dnode, thus the deleted dnode must remain online. The taosd process cannot be stopped until the delete operation is completed.
+- After a data node is dropped, other nodes will perceive the deletion of this dnodeID, and no node in any cluster will receive the request of the dnodeID.
+- dnodeID is automatically assigned by the cluster and cannot be specified manually. It is incremented at the time of generation and does not repeat.
+
+### View data nodes
+
+Execute the CLI program taos, log in to the TDengine system using the root account, and execute:
+
+```
+SHOW DNODES;
+```
+
+All dnodes, fqdn: port for each dnode, status (ready, offline, etc.), number of vnodes, number of unused vnodes in the cluster will be listed. You can use this command to view after adding or deleting a data node.
+
+### View virtual node group
+
+In order to make full use of multi-core technology and provide scalability, data needs to be processed in partitions. Therefore, TDengine will split the data of a DB into multiple parts and store them in multiple vnodes. These vnodes may be distributed in multiple data node dnodes, thus realizing scale-out. A vnode belongs to only one DB, but a DB can have multiple vnodes. vnode is allocated automatically by mnode according to the current system resources without any manual intervention.
+
+Execute the CLI program taos, log in to the TDengine system using the root account, and execute:
+
+```
+SHOW VGROUPS;
+```
+
+## <a class="anchor" id="high-availability"></a> High-availability of vnode
+
+TDengine provides high-availability of system through a multi-replica mechanism, including high-availability of vnode and mnode.
+
+The number of replicas of vnode is associated with DB. There can be multiple DBs in a cluster. Each DB can be configured with different replicas according to operational requirements. When creating a database, specify the number of replicas with parameter replica (the default is 1). If the number of replicas is 1, the reliability of the system cannot be guaranteed. As long as the node where the data is located goes down, the service cannot be provided. The number of nodes in the cluster must be greater than or equal to the number of replicas, otherwise the error "more dnodes are needed" will be returned when creating a table. For example, the following command will create a database demo with 3 replicas:
+
+```
+CREATE DATABASE demo replica 3;
+```
+
+The data in a DB will be partitioned and splitted into multiple vnode groups. The number of vnodes in a vnode group is the number of replicas of the DB, and the data of each vnode in the same vnode group is completely consistent. In order to ensure high-availability, the vnodes in a vnode group must be distributed in different dnode data nodes (in actual deployment, they need to be on different physical machines). As long as more than half of the vnodes in a vgroup are working, the vgroup can be normally serving.
+
+There may be data from multiple DBs of data in a data node dnode, so when a dnode is offline, it may affect multiple DBs. If half or more of the vnodes in a vnode group do not work, then the vnode group cannot serve externally and cannot insert or read data, which will affect the reading and writing operations of some tables in the DB to which it belongs.
+
+Because of the introduction of vnode, it is impossible to simply draw a conclusion: "If more than half of the data nodes in the cluster work in dnode, the cluster should work." But for simple cases, it is easier to judge. For example, if the number of replicas is 3 and there are only 3 dnodes, the whole cluster can still work normally if only one node does not work, but if two data nodes do not work, the whole cluster cannot work normally.
+
+## <a class="anchor" id="mnode"></a> High-availability of mnode
+
+TDengine cluster is managed by mnode (a module of taosd, management node). In order to ensure the high-availability of mnode, multiple mnode replicas can be configured. The number of replicas is determined by system configuration parameter numOfMnodes, and the effective range is 1-3. In order to ensure the strong consistency of metadata, mnode replicas are duplicated synchronously.
+
+A cluster has multiple data node dnodes, but a dnode runs at most one mnode instance. In the case of multiple dnodes, which dnode can be used as an mnode? This is automatically specified by the system according to the resource situation on the whole. User can execute the following command in the console of TDengine through the CLI program taos:
+
+```
+SHOW MNODES;
+```
+
+To view the mnode list, which lists the End Point and roles (master, slave, unsynced, or offline) of the dnode where the mnode is located. When the first data node in the cluster starts, the data node must run an mnode instance, otherwise the dnode of the data node cannot work properly because a system must have at least one mnode. If numOfMnodes is configured to 2, when the second dnode is started, the latter will also run an mnode instance.
+
+To ensure the high-availability of mnode service, numOfMnodes must be set to 2 or greater. Because the metadata saved by mnode must be strongly consistent, if numOfMnodes is greater than 2, the duplication parameter quorum is automatically set to 2, that is to say, at least two replicas must be guaranteed to write the data successfully before notifying the client application of successful writing.
+
+**Note:** A TDengine highly-available system, whether vnode or mnode, must be configured with multiple replicas.
+
+## <a class="anchor" id="load-balancing"></a> Load Balancing
+
+There are three situations in which load balancing will be triggered, and no manual intervention is required.
+
+- When a new data node is added to the cluster, the system will automatically trigger load balancing, and the data on some nodes will be automatically migrated to the new data node without any manual intervention.
+- When a data node is removed from the cluster, the system will automatically migrate the data on the data node to other data nodes without any manual intervention.
+- If a data node is overheated (too large amount of data), the system will automatically load balance and migrate some vnodes of the data node to other nodes.
+
+When the above three situations occur, the system will start a load computing of each data node to decide how to migrate.
+
+**[Tip] Load balancing is controlled by parameter balance, which determines whether to start automatic load balancing.**
+
+## <a class="anchor" id="offline"></a> Offline Processing of Data Nodes
+
+If a data node is offline, the TDengine cluster will automatically detect it. There are two detailed situations:
+
+- If the data node is offline for more than a certain period of time (configuration parameter offlineThreshold in taos.cfg controls the duration), the system will automatically delete the data node, generate system alarm information and trigger the load balancing process. If the deleted data node is online again, it will not be able to join the cluster, and the system administrator will need to add it to the cluster again.
+- After offline, the system will automatically start the data recovery process if it goes online again within the duration of offlineThreshold. After the data is fully recovered, the node will start to work normally.
+
+**Note:** If each data node belonging to a virtual node group (including mnode group) is in offline or unsynced state, Master can only be elected after all data nodes in the virtual node group are online and can exchange status information, and the virtual node group can serve externally. For example, the whole cluster has 3 data nodes with 3 replicas. If all 3 data nodes go down and then 2 data nodes restart, it will not work. Only when all 3 data nodes restart successfully can serve externally again.
+
+## <a class="anchor" id="arbitrator"></a> How to Use Arbitrator
+
+If the number of replicas is even, it is impossible to elect a master from a vnode group when half of the vnodes are not working. Similarly, when half of the mnodes are not working, the master of the mnode cannot be elected because of the "split brain" problem. To solve this problem, TDengine introduced the concept of Arbitrator. Arbitrator simulates a vnode or mnode working, but is simply responsible for networking, and does not handle any data insertion or access. As long as more than half of the vnodes or mnodes, including the Arbitrator, work, the vnode group or mnode group can normally provide data insertion or query services. For example, in the case of 2 replicas, if one node A is offline, but the other node B is normal on and can connect to the Arbitrator, then node B can work normally.
+
+In a word, under the current version, TDengine recommends configuring Arbitrator in double-replica environment to improve the availability.
+
+The name of the executable for Arbitrator is tarbitrator. The executable has almost no requirements for system resources, just need to ensure a network connection, with any Linux server to run it. The following briefly describes the steps to install the configuration:
+
+
+
+1. Click [Package Download](https://www.taosdata.com/cn/all-downloads/), and in the TDengine Arbitrator Linux section, select the appropriate version to download and install.
+2. The command line parameter  -p of this application can specify the port number of its external service, and the default is 6042.
+3. Modify the configuration file of each taosd instance, and set parameter arbitrator to the End Point corresponding to the tarbitrator in taos.cfg. (If this parameter is configured, when the number of replicas is even, the system will automatically connect the configured Arbitrator. If the number of replicas is odd, even if the Arbitrator is configured, the system will not establish a connection.)
+4. The Arbitrator configured in the configuration file will appear in the return result of instruction `SHOW DNODES`; the value of the corresponding role column will be "arb".
+
diff --git a/documentation20/en/11.administrator/docs.md b/documentation20/en/11.administrator/docs.md
new file mode 100644
index 0000000000000000000000000000000000000000..509b7fa62fc62c20ec271361124792c6ba0d461f
--- /dev/null
+++ b/documentation20/en/11.administrator/docs.md
@@ -0,0 +1,496 @@
+# TDengine Operation and Maintenance
+
+## <a class="anchor" id="planning"></a> Capacity Planing
+
+Using TDengine to build an IoT big data platform, computing resource and storage resource need to be planned according to business scenarios. The following is a discussion of the memory, CPU and hard disk space required for the system to run.
+
+### Memory requirements
+
+Each DB can create a fixed number of vgroups, which is the same as the CPU cores by default and can be configured by maxVgroupsPerDb; each replica in the vgroup would be a vnode; each vnode takes up a fixed amount of memory (the size is related to the database's configuration parameters blocks and cache); each table takes up memory related to the total length of the tag; in addition, the system will have some fixed memory overhead. Therefore, the system memory required for each DB can be calculated by the following formula:
+
+```
+Database Memory Size = maxVgroupsPerDb * (blocks * cache + 10MB) + numOfTables * (tagSizePerTable + 0.5KB)
+```
+
+Example: Assuming a 4-core machine, cache is the default size of 16M, blocks is the default value of 6, assuming there are 100,000 tables, and the total tag length is 256 bytes, the total memory requirement is: 4 * (16 * 6 + 10) + 100,000 * (0.25 + 0.5)/1000 = 499M.
+
+The actual running system often stores the data in different DBs according to different characteristics of the data. All these shall be considered when planning.
+
+If there is plenty of memory, the configuration of Blocks can be increased so that more data will be stored in memory and the query speed will be improved.
+
+### CPU requirements
+
+CPU requirements depend on the following two aspects:
+
+- **Data insertion** TDengine single core can handle at least 10,000 insertion requests per second. Each insertion request can take multiple records, and inserting one record at a time is almost the same as inserting 10 records in computing resources consuming. Therefore, the larger the number of inserts, the higher the insertion efficiency. If an insert request has more than 200 records, a single core can insert 1 million records per second. However, the faster the insertion speed, the higher the requirement for front-end data collection, because records need to be cached and then inserted in batches.
+- **Query requirements** TDengine to provide efficient queries, but the queries in each scenario vary greatly and the query frequency too, making it difficult to give objective figures. Users need to write some query statements for their own scenes to determine.
+
+Therefore, only for data insertion, CPU can be estimated, but the computing resources consumed by query cannot be that clear. In the actual operation, it is not recommended to make CPU utilization rate over 50%. After that, new nodes need to be added to bring more computing resources.
+
+### Storage requirements
+
+Compared with general databases, TDengine has an ultra-high compression ratio. In most scenarios, the compression ratio of TDengine will not be less than 5:1, and in some scenarios, maybe over 10:1, depending on the actual data characteristics. The raw data size before compressed can be calculated as follows:
+
+```
+Raw DataSize = numOfTables * rowSizePerTable * rowsPerTable
+```
+
+Example: 10 million smart meters, each meter collects data every 15 minutes, and the data collected each time is 128 bytes, so the original data amount in one year is: 10000000 * 128 * 24 * 60/15 * 365 = 44.8512 T. The TDengine consumes approximately 44.851/5 = 8.97024 T.
+
+User can set the maximum retention time of data on disk through parameter `keep`. In order to further reduce the storage cost, TDengine also provides tiered storage. The coldest data can be stored on the cheapest storage media. Application access does not need to be adjusted, but lower reading speed.
+
+To improve speed, multiple hard disks can be configured so that data can be written or read concurrently. It should be reminded that TDengine provides high reliability of data in the form of multiple replicas, so it is no longer necessary to use expensive disk arrays.
+
+### Number of physical or virtual machines
+
+According to the above estimation of memory, CPU and storage, we can know how many cores, how much memory and storage space the whole system needs. If the number of data replicas is not 1, the total demand needs to be multiplied by the number of replicas.
+
+Because TDengine provides great scale-out feature, it is easy to decide how many physical or virtual machines need to be purchased according to the total amount and the resources of a single physical/ virtual machine.
+
+**Calculate CPU, memory and storage immediately, see:** [**Resource Estimation**](https://www.taosdata.com/config/config.html)
+
+### Fault Tolerance and Disaster Recovery
+
+### Fault tolerance
+
+TDengine supports WAL (Write Ahead Log) mechanism to realize fault tolerance of data and ensure high-availability of data.
+
+When TDengine receives the application's request packet, it first writes the requested original packet into the database log file, and then deletes the corresponding WAL after the data is successfully written. This ensures that TDengine can recover data from the database log file when the service is restarted due to power failure or other reasons, thus avoiding data loss.
+
+There are two system configuration parameters involved:
+
+- walLevel: WAL level, 0: do not write wal; 1: write wal, but do not execute fsync; 2: write wal and execute fsync.
+- fsync: the cycle in which fsync is executed when walLevel is set to 2. Setting to 0 means that fsync is executed immediately whenever there is a write.
+
+To guarantee 100% data safe, you need to set walLevel to 2 and fsync to 0. In that way, the write speed will decrease. However, if the number of threads starting to write data on the application side reaches a certain number (more than 50), the performance of writing data will also be good, only about 30% lower than that of fsync set to 3000 milliseconds.
+
+### Disaster recovery
+
+The cluster of TDengine provides high-availability of the system and implements disaster recovery through the multipl-replica mechanism.
+
+TDengine cluster is managed by mnode. In order to ensure the high reliability of the mnode, multiple mnode replicas can be configured. The number of replicas is determined by system configuration parameter numOfMnodes. In order to support high reliability, it needs to be set to be greater than 1. In order to ensure the strong consistency of metadata, mnode replicas duplicate data synchronously to ensure the strong consistency of metadata.
+
+The number of replicas of time-series data in TDengine cluster is associated with databases. There can be multiple databases in a cluster, and each database can be configured with different replicas. When creating a database, specify the number of replicas through parameter replica. In order to support high reliability, it is necessary to set the number of replicas greater than 1.
+
+The number of nodes in TDengine cluster must be greater than or equal to the number of replicas, otherwise an error will be reported in table creation.
+
+When the nodes in TDengine cluster are deployed on different physical machines and multiple replicas are set, the high reliability of the system is implemented without using other software or tools. TDengine Enterprise Edition can also deploy replicas in different server rooms, thus realizing remote disaster recovery.
+
+## <a class="anchor" id="config"></a> Server-side Configuration
+
+The background service of TDengine system is provided by taosd, and the configuration parameters can be modified in the configuration file taos.cfg to meet the requirements of different scenarios. The default location of the configuration file is the /etc/taos directory, which can be specified by executing the parameter -c from the taosd command line. Such as taosd-c/home/user, to specify that the configuration file is located in the /home/user directory.
+
+You can also use “-C” to show the current server configuration parameters:
+
+```
+taosd -C
+```
+
+Only some important configuration parameters are listed below. For more parameters, please refer to the instructions in the configuration file. Please refer to the previous chapters for detailed introduction and function of each parameter, and the default of these parameters is working and generally does not need to be set. **Note: After the configuration is modified, \*taosd service\* needs to be restarted to take effect.**
+
+- firstEp: end point of the first dnode in the actively connected cluster when taosd starts, the default value is localhost: 6030.
+- fqdn: FQDN of the data node, which defaults to the first hostname configured by the operating system. If you are accustomed to IP address access, you can set it to the IP address of the node.
+- serverPort: the port number of the external service after taosd started, the default value is 6030.
+- httpPort: the port number used by the RESTful service to which all HTTP requests (TCP) require a query/write request. The default value is 6041.
+- dataDir: the data file directory to which all data files will be written. [Default:/var/lib/taos](http://default/var/lib/taos).
+- logDir: the log file directory to which the running log files of the client and server will be written. [Default:/var/log/taos](http://default/var/log/taos).
+- arbitrator: the end point of the arbiter in the system; the default value is null.
+- role: optional role for dnode. 0-any; it can be used as an mnode and to allocate vnodes; 1-mgmt; It can only be an mnode, but not to allocate vnodes; 2-dnode; caannot be an mnode, only vnode can be allocated
+- debugFlage: run the log switch. 131 (output error and warning logs), 135 (output error, warning, and debug logs), 143 (output error, warning, debug, and trace logs). Default value: 131 or 135 (different modules have different default values).
+- numOfLogLines: the maximum number of lines allowed for a single log file. Default: 10,000,000 lines.
+- logKeepDays: the maximum retention time of the log file. When it is greater than 0, the log file will be renamed to taosdlog.xxx, where xxx is the timestamp of the last modification of the log file in seconds. Default: 0 days.
+- maxSQLLength: the maximum length allowed for a single SQL statement. Default: 65380 bytes.
+- telemetryReporting: whether TDengine is allowed to collect and report basic usage information. 0 means not allowed, and 1 means allowed. Default: 1.
+- stream: whether continuous query (a stream computing function) is enabled, 0 means not allowed, 1 means allowed. Default: 1.
+- queryBufferSize: the amount of memory reserved for all concurrent queries. The calculation rule can be multiplied by the number of the table according to the maximum possible concurrent number in practical application, and then multiplied by 170. The unit is MB (in versions before 2.0. 15, the unit of this parameter is byte).
+- ratioOfQueryCores: set the maximum number of query threads. The minimum value of 0 means that there is only one query thread; the maximum value of 2 indicates that the maximum number of query threads established is 2 times the number of CPU cores. The default is 1, which indicates the maximum number of query threads equals to the number of CPU cores. This value can be a decimal, that is, 0.5 indicates that the query thread with half of the maximum CPU cores is established.
+
+**Note:** for ports, TDengine will use 13 continuous TCP and UDP port numbers from serverPort, so be sure to open them in the firewall. Therefore, if it is the default configuration, a total of 13 ports from 6030 to 6042 need to be opened, and the same for both TCP and UDP.
+
+Data in different application scenarios often have different data characteristics, such as retention days, number of replicas, collection frequency, record size, number of collection points, compression, etc. In order to obtain the best efficiency in storage, TDengine provides the following storage-related system configuration parameters:
+
+- days: the time span for a data file to store data, in days, the default value is 10.
+- keep: the number of days to keep data in the database, in days, default value: 3650.
+- minRows: the minimum number of records in a file block, in pieces, default: 100.
+- maxRows: the maximum number of records in a file block, in pieces, default: 4096.
+- comp: file compression flag bit, 0: off; 1: one-stage compression; 2: two-stage compression. Default: 2.
+- walLevel: WAL level. 1: write wal, but do not execute fsync; 2: write wal and execute fsync. Default: 1.
+- fsync: the period during which fsync is executed when wal is set to 2. Setting to 0 means that fsync is executed immediately whenever a write happens, in milliseconds, and the default value is 3000.
+- cache: the size of the memory block in megabytes (MB), default: 16.
+- blocks: how many cache-sized memory blocks are in each VNODE (TSDB). Therefore, the memory size used by a VNODE is roughly (cache * blocks), in blocks, and the default value is 4.
+- replica: number of replicas; value range: 1-3, in items, default value: 1
+- precision: timestamp precision identification, ms for milliseconds and us for microseconds. Default: ms
+- cacheLast: whether the sub-table last_row is cached in memory, 0: off; 1: on. Default: 0. (This parameter is supported as of version 2.0. 11)
+
+For an application scenario, there may be data with multiple characteristics coexisting. The best design is to put tables with the same data characteristics in one database. Such an application has multiple databases, and each one can be configured with different storage parameters, thus ensuring the optimal performance of the system. TDengine allows the application to specify the above storage parameter in database creation. If specified, the parameters will override the corresponding system configuration parameters. For example, there is the following SQL:
+
+```
+ create database demo days 10 cache 32 blocks 8 replica 3 update 1;
+```
+
+The SQL creates a database demo, each data file stores 10 days of data, the memory block is 32 megabytes, each VNODE occupies 8 memory blocks, the number of replicas is 3, updates are allowed, and other parameters are completely consistent with the system configuration.
+
+When adding a new dnode to the TDengine cluster, some parameters related to the cluster must be the same as the configuration of the existing cluster, otherwise it cannot be successfully added to the cluster. The parameters that will be verified are as follows:
+
+- numOfMnodes: the number of management nodes in the system. Default: 3.
+- balance: whether to enable load balancing. 0: No, 1: Yes. Default: 1.
+- mnodeEqualVnodeNum: an mnode is equal to the number of vnodes consumed. Default: 4.
+- offlineThreshold: the threshold for a dnode to be offline, exceed which the dnode will be removed from the cluster. The unit is seconds, and the default value is 86400*10 (that is, 10 days).
+- statusInterval: the length of time dnode reports status to mnode. The unit is seconds, and the default value is 1.
+- maxTablesPerVnode: the maximum number of tables that can be created in each vnode. Default: 1000000.
+- maxVgroupsPerDb: the maximum number of vgroups that can be used in each database.
+- arbitrator: the end point of the arbiter in system, which is empty by default.
+- See Client Configuration for the configuration of timezone, locale and charset.
+
+For the convenience of debugging, the log configuration of each dnode can be temporarily adjusted through SQL statements, and all will be invalid after system restarting:
+
+```mysql
+ALTER DNODE <dnode_id> <config>
+```
+
+- dnode_id: available from the SQL statement "SHOW DNODES" command
+- config: the log parameter to be adjusted, and the value is taken in the following list
+
+resetlog truncates the old log file and creates a new log file debugFlag < 131 135 143 > Set debugFlag to 131, 135 or 143.
+
+For example:
+
+```
+    alter dnode 1 debugFlag 135;
+```
+
+## <a class="anchor" id="client"></a> Client Configuration
+
+The foreground interactive client application of TDengine system is taos and application driver, which shares the same configuration file taos.cfg with taosd. When running taos, use the parameter -c to specify the configuration file directory, such as taos-c/home/cfg, which means using the parameters in the taos.cfg configuration file under the /home/cfg/ directory. The default directory is /etc/taos. For more information on how to use taos, see the help information taos --help. This section mainly describes the parameters used by the taos client application in the configuration file taos.cfg.
+
+**Versions after 2.0. 10.0 support the following parameters on command line to display the current client configuration parameters**
+
+```bash
+taos -C  或  taos --dump-config
+```
+
+Client configuration parameters:
+
+- firstEp: end point of the first taosd instance in the actively connected cluster when taos is started, the default value is localhost: 6030.
+- secondEp: when taos starts, if not impossible to connect to firstEp, it will try to connect to secondEp.
+- locale
+    Default value: obtained dynamically from the system. If the automatic acquisition fails, user needs to set it in the configuration file or through API
+    
+    TDengine provides a special field type nchar for storing non-ASCII encoded wide characters such as Chinese, Japanese and Korean. The data written to the nchar field will be uniformly encoded in UCS4-LE format and sent to the server. It should be noted that the correctness of coding is guaranteed by the client. Therefore, if users want to normally use nchar fields to store non-ASCII characters such as Chinese, Japanese, Korean, etc., it’s needed to set the encoding format of the client correctly.
+    
+    The characters inputted by the client are all in the current default coding format of the operating system, mostly UTF-8 on Linux systems, and some Chinese system codes may be GB18030 or GBK, etc. The default encoding in the docker environment is POSIX. In the Chinese versions of Windows system, the code is CP936. The client needs to ensure that the character set it uses is correctly set, that is, the current encoded character set of the operating system running by the client, in order to ensure that the data in nchar is correctly converted into UCS4-LE encoding format.
+    
+    The naming rules of locale in Linux are: < language > _ < region >. < character set coding >, such as: zh_CN.UTF-8, zh stands for Chinese, CN stands for mainland region, and UTF-8 stands for character set. Character set encoding provides a description of encoding transformations for clients to correctly parse local strings. Linux system and Mac OSX system can determine the character encoding of the system by setting locale. Because the locale used by Windows is not the POSIX standard locale format, another configuration parameter charset is needed to specify the character encoding under Windows. You can also use charset to specify character encoding in Linux systems.
+
+- charset
+
+    Default value: obtained dynamically from the system. If the automatic acquisition fails, user needs to set it in the configuration file or through API
+    
+    If charset is not set in the configuration file, in Linux system, when taos starts up, it automatically reads the current locale information of the system, and parses and extracts the charset encoding format from the locale information. If the automatic reading of locale information fails, an attempt is made to read the charset configuration, and if the reading of the charset configuration also fails, the startup process is interrupted.
+    
+    In Linux system, locale information contains character encoding information, so it is unnecessary to set charset separately after setting locale of Linux system correctly. For example:
+    
+    ```
+    locale zh_CN.UTF-8
+    ```
+    On Windows systems, the current system encoding cannot be obtained from locale. If string encoding information cannot be read from the configuration file, taos defaults to CP936. It is equivalent to adding the following to the configuration file:
+    ```
+    charset CP936
+    ```
+    If you need to adjust the character encoding, check the encoding used by the current operating system and set it correctly in the configuration file.
+    
+    In Linux systems, if user sets both locale and charset encoding charset, and the locale and charset are inconsistent, the value set later will override the value set earlier.
+    ```
+    locale zh_CN.UTF-8
+    charset GBK
+    ```
+    The valid value for charset is GBK.
+    
+    And the valid value for charset is UTF-8.
+    
+    The configuration parameters of log are exactly the same as those of server.
+
+- timezone
+
+    Default value: get the current time zone option dynamically from the system
+
+    The time zone in which the client runs the system. In order to deal with the problem of data writing and query in multiple time zones, TDengine uses Unix Timestamp to record and store timestamps. The characteristics of UNIX timestamps determine that the generated timestamps are consistent at any time regardless of any time zone. It should be noted that UNIX timestamps are converted and recorded on the client side. In order to ensure that other forms of time on the client are converted into the correct Unix timestamp, the correct time zone needs to be set.
+
+    In Linux system, the client will automatically read the time zone information set by the system. Users can also set time zones in profiles in a number of ways. For example:
+    ```
+    timezone UTC-8
+    timezone GMT-8
+    timezone Asia/Shanghai
+    ```
+    
+    All above are legal to set the format of the East Eight Zone.
+    
+    The setting of time zone affects the content of non-Unix timestamp (timestamp string, parsing of keyword now) in query and writing SQL statements. For example:
+
+    ```sql
+    SELECT count(*) FROM table_name WHERE TS<'2019-04-11 12:01:08';
+    ```
+    
+    In East Eight Zone, the SQL statement is equivalent to
+    ```sql
+    SELECT count(*) FROM table_name WHERE TS<1554955268000;
+    ```
+    
+    In the UTC time zone, the SQL statement is equivalent to
+    ```sql
+    SELECT count(*) FROM table_name WHERE TS<1554984068000;
+    ```
+    In order to avoid the uncertainty caused by using string time format, Unix timestamp can also be used directly. In addition, timestamp strings with time zones can also be used in SQL statements, such as: timestamp strings in RFC3339 format, 2013-04-12T15: 52: 01.123 +08:00, or ISO-8601 format timestamp strings 2013-04-12T15: 52: 01.123 +0800. The conversion of the above two strings into Unix timestamps is not affected by the time zone in which the system is located.
+    
+    When starting taos, you can also specify an end point for an instance of taosd from the command line, otherwise read from taos.cfg.
+
+- maxBinaryDisplayWidth
+    The upper limit of the display width of binary and nchar fields in a shell, beyond which parts will be hidden. Default: 30. You can modify this option dynamically in the shell with the command set max_binary_display_width nn.
+
+## <a class="anchor" id="user"></a>User Management
+
+System administrators can add and delete users in CLI, and also modify passwords. The SQL syntax in the CLI is as follows:
+
+```sql
+CREATE USER <user_name> PASS <'password'>;
+```
+
+Create a user, and specify the user name and password. The password needs to be enclosed in single quotation marks. The single quotation marks are in English half-width.
+
+```sql
+DROP USER <user_name>;
+```
+
+Delete a user, root only.
+
+```sql
+ALTER USER <user_name> PASS <'password'>;
+```
+
+Modify the user password. In order to avoid being converted to lowercase, the password needs to be quoted in single quotation marks. The single quotation marks are in English half-width
+
+```sql
+ALTER USER <user_name> PRIVILEGE <write|read>;
+```
+
+Modify the user privilege to: write or read, without adding single quotation marks.
+
+Note: There are three privilege levels: super/write/read in the system, but it is not allowed to give super privilege to users through alter instruction at present.
+
+```mysql
+SHOW USERS;
+```
+
+Show all users
+
+**Note:** In SQL syntax, < > indicates the part that requires user to input, but do not enter < > itself
+
+## <a class="anchor" id="import"></a> Import Data
+
+TDengine provides a variety of convenient data import functions, including imported by script file, by data file, and by taosdump tool.
+
+**Import by script file**
+
+TDengine shell supports source filename command, which is used to run SQL statements from a file in batch. Users can write SQL commands such as database building, table building and data writing in the same file. Each command has a separate line. By running source command in the shell, SQL statements in the file can be run in batches in sequence. SQL statements beginning with '#' are considered comments and are automatically ignored by the shell.
+
+**Import by data file**
+
+TDengine also supports data import from CSV files on existing tables in the shell. The CSV file belongs to only one table, and the data format in the CSV file should be the same as the structure of the table to be imported. When importing, its syntax is as follows:
+
+```mysql
+insert into tb1 file 'path/data.csv';
+```
+
+Note: if there is descriptive information in the first line of the CSV file, please delete it manually before importing
+
+For example, there is now a sub-table d1001 whose table structure is as follows:
+
+```mysql
+taos> DESCRIBE d1001
+             Field              |        Type        |   Length    |    Note    |
+=================================================================================
+ ts                             | TIMESTAMP          |           8 |            |
+ current                        | FLOAT              |           4 |            |
+ voltage                        | INT                |           4 |            |
+ phase                          | FLOAT              |           4 |            |
+ location                       | BINARY             |          64 | TAG        |
+ groupid                        | INT                |           4 | TAG        |
+```
+
+And the format of the data.csv to import is as follows:
+
+```csv
+'2018-10-04 06:38:05.000',10.30000,219,0.31000
+'2018-10-05 06:38:15.000',12.60000,218,0.33000
+'2018-10-06 06:38:16.800',13.30000,221,0.32000
+'2018-10-07 06:38:05.000',13.30000,219,0.33000
+'2018-10-08 06:38:05.000',14.30000,219,0.34000
+'2018-10-09 06:38:05.000',15.30000,219,0.35000
+'2018-10-10 06:38:05.000',16.30000,219,0.31000
+'2018-10-11 06:38:05.000',17.30000,219,0.32000
+'2018-10-12 06:38:05.000',18.30000,219,0.31000
+```
+
+Then we can use the following command to import:
+
+```mysql
+taos> insert into d1001 file '~/data.csv';
+Query OK, 9 row(s) affected (0.004763s)
+```
+
+**Import via taosdump tool**
+
+TDengine provides a convenient database import and export tool, taosdump. Users can import data exported by taosdump from one system into other systems. Please refer to the blog: [User Guide of TDengine DUMP Tool](https://www.taosdata.com/blog/2020/03/09/1334.html).
+
+## <a class="anchor" id="export"></a> Export Data
+
+To facilitate data export, TDengine provides two export methods, namely, export by table and export by taosdump.
+
+**Export CSV file by table**
+
+If user needs to export data from a table or a STable, it can run in a shell
+
+```mysql
+select * from <tb_name> >> data.csv;
+```
+
+In this way, the data in table tb_name will be exported to the file data.csv in CSV format.
+
+**Export data by taosdump**
+
+TDengine provides a convenient database export tool, taosdump. Users can choose to export all databases, a database or a table in a database, all data or data for a time period, or even just the definition of a table as needed. Please refer to the blog: [User Guide of TDengine DUMP Tool](https://www.taosdata.com/blog/2020/03/09/1334.html)
+
+## <a class="anchor" id="status"></a> System Connection and Task Query Management
+
+The system administrator can query the connection, ongoing query and stream computing of the system from CLI, and can close the connection and stop the ongoing query and stream computing. The SQL syntax in the CLI is as follows:
+
+```mysql
+SHOW CONNECTIONS;
+```
+
+Show the connection of the database, and one column shows ip: port, which is the IP address and port number of the connection.
+
+```mysql
+KILL CONNECTION <connection-id>;
+```
+
+Force the database connection to close, where connection-id is the number in the first column displayed in SHOW CONNECTIONS.
+
+```mysql
+SHOW QUERIES;
+```
+
+Show the data query, where the two numbers separated by colons displayed in the first column are query-id and the connection-id that initiated the query application connection and the number of queries.
+
+```mysql
+KILL QUERY <query-id>;
+```
+
+Force to close the data query, where query-id is the connection-id: query-no string displayed in SHOW QUERIES, such as "105: 2", copy and paste it.
+
+```mysql
+SHOW STREAMS;
+```
+
+Show the stream computing, where the first column shows the two numbers separated by colons as stream-id and the connection-id to start the stream application connection and the number of times the stream was initiated.
+
+```mysql
+KILL STREAM <stream-id>;
+```
+
+Force to turn off the stream computing, in which stream-id is the connection-id: stream-no string displayed in SHOW STREAMS, such as 103: 2, copy and paste it.
+
+## System Monitoring
+
+After TDengine is started, it will automatically create a monitoring database log and write the server's CPU, memory, hard disk space, bandwidth, number of requests, disk read-write speed, slow query and other information into the database regularly. TDengine also records important system operations (such as logging in, creating, deleting databases, etc.) logs and various error alarm information and stores them in the log database. The system administrator can view the database directly from CLI or view the monitoring information through GUI on WEB.
+
+The collection of these monitoring metrics is turned on by default, but you can modify option enableMonitor in the configuration file to turn it off or on.
+
+## <a class="anchor" id="directories"></a> File Directory Structure
+
+After installing TDengine, the following directories or files are generated in the operating system by default:
+
+
+
+| **Directory/File**        | **Description**                                              |
+| ------------------------- | ------------------------------------------------------------ |
+| /usr/local/taos/bin       | TEngine’s executable directory. The executables are connected to the/usr/bin directory via softly links. |
+| /usr/local/taos/connector | TDengine’s various connector directories.                    |
+| /usr/local/taos/driver    | TDengine’s dynamic link library directory. Connect to /usr/lib directory via soft links. |
+| /usr/local/taos/examples  | TDengine’s application example directory for various languages. |
+| /usr/local/taos/include   | TDengine’s header files of C interface for externally serving. |
+| /etc/taos/taos.cfg        | TDengine’s default [configuration files].                    |
+| /var/lib/taos             | TDengine’s default data file directory, where the local can be modified via [configuration files]. |
+| /var/log/taos             | TDengine’s default log file directory, where the local can be modified via [configuration files]. |
+
+**Executables**
+
+All executables of TDengine are stored in the directory /usr/local/taos/bin by default. Including:
+
+- *taosd*: TDengine server-side executable
+- *taos*: TDengine Shell executable
+- *taosdump*: A data import/export tool
+- remove.sh: uninstall the TDengine script, please execute carefully, and link to rmtaos command in the/usr/bin directory. The TDengine installation directory /usr/local/taos will be removed, but/etc/taos,/var/lib/taos,/var/log/taos will remain.
+
+You can configure different data directories and log directories by modifying system configuration file taos.cfg.
+
+## <a class="anchor" id="keywords"></a> TDengine Parameter Limits and Reserved Keywords
+
+- Database name: cannot contain "." and other special characters, and cannot exceed 32 characters
+- Table name: cannot contain "." and other special characters, and cannot exceed 192 characters together with the database name to which it belongs
+- Table column name: cannot contain special characters, and cannot exceed 64 characters
+- Database name, table name, column name cannot begin with a number
+- Number of columns in table: cannot exceed 1024 columns
+- Maximum length of record: including 8 bytes as timestamp, no more than 16KB (each column of BINARY/NCHAR type will occupy an additional 2 bytes of storage location)
+- Default maximum string length for a single SQL statement: 65480 bytes
+- Number of database replicas: no more than 3
+- User name: no more than 23 bytes
+- User password: no more than 15 bytes
+- Number of Tags: no more than 128
+- Total length of label: cannot exceed 16K bytes
+- Number of records: limited by storage space only
+- Number of tables: limited only by the number of nodes
+- Number of databases: limited only by the number of nodes
+- Number of virtual nodes on a single database: cannot exceed 64
+
+At the moment, TDengine has nearly 200 internal reserved keywords, which cannot be used as database name, table name, STable name, data column name or tag column name regardless of case. The list of these keywords is as follows:
+
+| **List of Keywords** |             |              |            |           |
+| -------------------- | ----------- | ------------ | ---------- | --------- |
+| ABLOCKS              | CONNECTIONS | GT           | MNODES     | SLIDING   |
+| ABORT                | COPY        | ID           | MODULES    | SLIMIT    |
+| ACCOUNT              | COUNT       | IF           | NCHAR      | SMALLINT  |
+| ACCOUNTS             | CREATE      | IGNORE       | NE         | SPREAD    |
+| ADD                  | CTIME       | IMMEDIATE    | NONE       | STABLE    |
+| AFTER                | DATABASE    | IMPORT       | NOT        | STABLES   |
+| ALL                  | DATABASES   | IN           | NOTNULL    | STAR      |
+| ALTER                | DAYS        | INITIALLY    | NOW        | STATEMENT |
+| AND                  | DEFERRED    | INSERT       | OF         | STDDEV    |
+| AS                   | DELIMITERS  | INSTEAD      | OFFSET     | STREAM    |
+| ASC                  | DESC        | INTEGER      | OR         | STREAMS   |
+| ATTACH               | DESCRIBE    | INTERVAL     | ORDER      | STRING    |
+| AVG                  | DETACH      | INTO         | PASS       | SUM       |
+| BEFORE               | DIFF        | IP           | PERCENTILE | TABLE     |
+| BEGIN                | DISTINCT    | IS           | PLUS       | TABLES    |
+| BETWEEN              | DIVIDE      | ISNULL       | PRAGMA     | TAG       |
+| BIGINT               | DNODE       | JOIN         | PREV       | TAGS      |
+| BINARY               | DNODES      | KEEP         | PRIVILEGE  | TBLOCKS   |
+| BITAND               | DOT         | KEY          | QUERIES    | TBNAME    |
+| BITNOT               | DOUBLE      | KILL         | QUERY      | TIMES     |
+| BITOR                | DROP        | LAST         | RAISE      | TIMESTAMP |
+| BOOL                 | EACH        | LE           | REM        | TINYINT   |
+| BOTTOM               | END         | LEASTSQUARES | REPLACE    | TOP       |
+| BY                   | EQ          | LIKE         | REPLICA    | TRIGGER   |
+| CACHE                | EXISTS      | LIMIT        | RESET      | UMINUS    |
+| CASCADE              | EXPLAIN     | LINEAR       | RESTRICT   | UPLUS     |
+| CHANGE               | FAIL        | LOCAL        | ROW        | USE       |
+| CLOG                 | FILL        | LP           | ROWS       | USER      |
+| CLUSTER              | FIRST       | LSHIFT       | RP         | USERS     |
+| COLON                | FLOAT       | LT           | RSHIFT     | USING     |
+| COLUMN               | FOR         | MATCH        | SCORES     | VALUES    |
+| COMMA                | FROM        | MAX          | SELECT     | VARIABLE  |
+| COMP                 | GE          | METRIC       | SEMI       | VGROUPS   |
+| CONCAT               | GLOB        | METRICS      | SET        | VIEW      |
+| CONFIGS              | GRANTS      | MIN          | SHOW       | WAVG      |
+| CONFLICT             | GROUP       | MINUS        | SLASH      | WHERE     |
+| CONNECTION           |             |              |            |           |
diff --git a/documentation20/en/12.taos-sql/docs.md b/documentation20/en/12.taos-sql/docs.md
new file mode 100644
index 0000000000000000000000000000000000000000..f21508439253560b5b44e309872dd157fec848b7
--- /dev/null
+++ b/documentation20/en/12.taos-sql/docs.md
@@ -0,0 +1,1246 @@
+# TAOS SQL
+
+TDengine provides a SQL-style language, TAOS SQL, to insert or query data, and support other common tips. To finish this document, you should have some understanding about SQL.
+
+TAOS SQL is the main tool for users to write and query data to TDengine. TAOS SQL provides a style and mode similar to standard SQL to facilitate users to get started quickly. Strictly speaking, TAOS SQL is not and does not attempt to provide SQL standard syntax. In addition, since TDengine does not provide deletion function for temporal structured data, the relevant function of data deletion is non-existent in TAO SQL.
+
+Let’s take a look at the conventions used for syntax descriptions.
+
+- The content in < > is what the user needs to enter, but do not enter < > itself
+- [] indicates that the content is optional, but do not enter [] itself
+- "|" means you can select one of multiple choices, but you cannot enter | yourself
+- "…" means repeating for as many times
+
+In order to better explain the rules and characteristics of SQL syntax, this document assumes that there is a data set. Take smart meters as an example, each smart meter collects three metrics: current, voltage and phase. It is modeled as follows:
+
+```mysql
+taos> DESCRIBE meters;
+             Field              |        Type        |   Length    |    Note    |
+=================================================================================
+ ts                             | TIMESTAMP          |           8 |            |
+ current                        | FLOAT              |           4 |            |
+ voltage                        | INT                |           4 |            |
+ phase                          | FLOAT              |           4 |            |
+ location                       | BINARY             |          64 | TAG        |
+ groupid                        | INT                |           4 | TAG        |
+```
+
+The data set contains data from four smart meters, which correspond to four sub-tables according to the modeling rules of TDengine, and their names are D1001, D1002, D1003 and D1004 respectively.
+
+## <a class="anchor" id="data-type"></a> Data Types
+
+With TDengine, the most important thing is timestamp. When creating and inserting records and querying history records, you need to specify a timestamp. The timestamp has the following rules:
+
+- Time Format: 'YYYY-MM-DD HH:mm:ss.MS', default in milliseconds. For example,'2017-08-12 18:52:58.128'
+- Internal Function **now** : this is the current time of the server
+- When inserting a record, if timestamp is NOW, then use the server current time.
+- Epch Time: a timestamp value can also be a long integer representing milliseconds since 1970-01-01 08:00:00.000.
+- Arithmetic operations can be applied to timestamp. For example: now-2h represents a timestamp which is 2 hours ago from the current server time. Units include u( microsecond), a (milliseconds), s (seconds), m (minutes), h (hours), d (days), w (weeks). In `select * from t1 where ts > now-2w and ts <= now-1w`, which queries data of the whole week before two weeks. To specify the interval of down sampling, you can also use n(calendar month) and y(calendar year) as time units.
+
+Default time precision of TDengine is millisecond, you can change it to microseocnd by setting parameter enableMicrosecond. 
+
+In TDengine, the following 10 data types can be used in data model of an ordinary table.
+
+|      | **Data Type** | **Bytes** | **Note**                                                     |
+| ---- | ------------- | --------- | ------------------------------------------------------------ |
+| 1    | TIMESTAMP     | 8         | Time stamp. Default in milliseconds, and support microseconds. Starting from 1970-01-01 00:00:00. 000 (UTC/GMT), the timing cannot be earlier than this time. |
+| 2    | INT           | 4         | A nullable integer type with a range of [-2^31+1, 2^31-1 ]   |
+| 3    | BIGINT        | 8         | A nullable integer type with a range of [-2^59, 2^59 ]       |
+| 4    | FLOAT         | 4         | A standard nullable float type with 6 -7 significant digits and a range of [-3.4E38, 3.4E38] |
+| 5    | DOUBLE        | 8         | A standard nullable double float type with 15-16 significant digits and a range of [-1.7E308, 1.7E308] |
+| 6    | BINARY        | Custom    | Used to record ASCII strings. Theoretically, the maximum length can be 16,374 bytes, but since each row of data can be up to 16K bytes, the actual limit is generally smaller than the theoretical value. Binary only supports string input, and single quotation marks are used at both ends of the string, otherwise all English will be automatically converted to lowercase. When using, the size must be specified. For example, binary (20) defines a string with a maximum length of 20 characters, and each character occupies 1 byte of storage space. In this case, if the user string exceeds 20 bytes, an error will be reported. For single quotation marks in strings, they can be represented by escape character backslash plus single quotation marks, that is\ '. |
+| 7    | SMALLINT      | 2         | A nullable integer type with a range of [-32767, 32767]      |
+| 8    | TINYINT       | 1         | A nullable integer type with a range of [-127, 127]          |
+| 9    | BOOL          | 1         | Boolean type，{true, false}                                  |
+| 10   | NCHAR         | Custom    | Used to record non-ASCII strings, such as Chinese characters. Each nchar character takes up 4 bytes of storage space. Single quotation marks are used at both ends of the string, and escape characters are required for single quotation marks in the string, that is \’. When nchar is used, the string size must be specified. A column of type nchar (10) indicates that the string of this column stores up to 10 nchar characters, which will take up 40 bytes of space. If the length of the user string exceeds the declared length, an error will be reported. |
+
+
+
+**Tips**:
+
+1. TDengine is case-insensitive to English characters in SQL statements and automatically converts them to lowercase for execution. Therefore, the user's case-sensitive strings and passwords need to be enclosed in single quotation marks.
+2. Avoid using BINARY type to save non-ASCII type strings, which will easily lead to errors such as garbled data. The correct way is to use NCHAR type to save Chinese characters.
+
+## <a class="anchor" id="management"></a>Database Management
+
+- **Create a Database**
+
+   ```mysql
+      CREATE DATABASE [IF NOT EXISTS] db_name [KEEP keep] [DAYS days] [UPDATE 1];
+   ```
+
+Note:
+
+1. KEEP is how long the data of the database is kept, the default is 3650 days (10 years), and the database will automatically delete the data expired;
+2. UPDATE marks the database support updating the same timestamp data;
+3. Maximum length of the database name is 33;
+4. Maximum length of a SQL statement is 65480 characters;
+5.  Database has more storage-related configuration parameters, see System Management.
+
+- **Show current system parameters**
+
+    ```mysql
+    SHOW VARIABLES;
+    ```
+
+- **Use a database**
+
+    ```mysql
+    USE db_name;
+    ```
+    Use/switch database
+
+- **Drop a database**
+    ```mysql
+    DROP DATABASE [IF EXISTS] db_name;
+    ```
+    Delete a database, all data tables included will be deleted. Please use with caution.
+
+- **Modify database parameters**
+
+    ```mysql
+    ALTER DATABASE db_name COMP 2;
+    ```
+    COMP parameter modifies the database file compression flag bit, with the default value of 2 and the value range is [0, 2]. 0 means no compression, 1 means one-stage compression, and 2 means two-stage compression.
+
+    ```mysql
+    ALTER DATABASE db_name REPLICA 2;
+    ```
+    REPLICA parameter refers to the number of replicas of the modified database, and the value range is [1, 3]. For use in a cluster, the number of replicas must be less than or equal to the number of DNODE.
+
+    ```mysql
+    ALTER DATABASE db_name KEEP 365;
+    ```
+    The KEEP parameter refers to the number of days to save a modified data file. The default value is 3650, and the value range is [days, 365000]. It must be greater than or equal to the days parameter value.
+
+   ```mysql
+   ALTER DATABASE db_name QUORUM 2;
+   ```
+   QUORUM parameter refers to the number of confirmations required for successful data writing, and the value range is [1, 3]. For asynchronous replication, quorum is set to 1, and the virtual node with master role can confirm it by itself. For synchronous replication, it needs to be at least 2 or greater. In principle, Quorum > = 1 and Quorum < = replica number, which is required when starting a synchronization module instance.
+
+    ```mysql
+    ALTER DATABASE db_name BLOCKS 100;
+    ```
+   BLOCKS parameter is the number of cache-sized memory blocks in each VNODE (TSDB), so the memory size used for a VNODE equals roughly (cache * blocks). Value range is [3,1000].
+
+    ```mysql
+    ALTER DATABASE db_name CACHELAST 0;
+    ```
+    CACHELAST parameter controls whether last_row of the data subtable is cached in memory. The default value is 0, and the value range is [0, 1]. Where 0 means not enabled and 1 means enabled. (supported from version 2.0. 11)
+    
+    **Tips**: After all the above parameters are modified, show databases can be used to confirm whether the modification is successful.
+
+- **Show all databases in system**
+
+    ```mysql
+    SHOW DATABASES;
+    ```
+
+## <a class="anchor" id="table"></a> Table Management
+
+- Create a table
+Note:
+
+1. The first field must be a timestamp, and system will set it as the primary key;
+2. The max length of table name is 192;
+3. The length of each row of the table cannot exceed 16k characters;
+4. Sub-table names can only consist of letters, numbers, and underscores, and cannot begin with numbers
+5. If the data type binary or nchar is used, the maximum number of bytes should be specified, such as binary (20), which means 20 bytes;
+
+- **Create a table via STable**
+
+    ```mysql
+    CREATE TABLE [IF NOT EXISTS] tb_name USING stb_name TAGS (tag_value1, ...);
+    ```
+    Use a STable as template and assign tag values to create a data table.
+
+- **Create a data table using STable as a template and specify a specific tags column**
+
+   ```mysql
+   CREATE TABLE [IF NOT EXISTS] tb_name USING stb_name (tag_name1, ...) TAGS (tag_value1, ...);
+   ```
+   Using the specified STable as a template, specify the values of some tags columns to create a data table. (Unspecified tags columns are set to null values.)
+   Note: This method has been supported since version 2.0. 17. In previous versions, tags columns were not allowed to be specified, but the values of all tags columns must be explicitly given.
+
+- **Create tables in batches**
+
+   ```mysql
+   CREATE TABLE [IF NOT EXISTS] tb_name1 USING stb_name TAGS (tag_value1, ...) tb_name2 USING stb_name TAGS (tag_value2, ...) ...;
+   ```
+   Create a large number of data tables in batches faster. (Server side 2.0. 14 and above)
+   
+   Note:
+   1. The method of batch creating tables requires that the data table must use STable as a template.
+   2. On the premise of not exceeding the length limit of SQL statements, it is suggested that the number of tables in a single statement should be controlled between 1000 and 3000, which will obtain an ideal speed of table building.
+
+- **Drop a table**
+    
+    ```mysql
+    DROP TABLE [IF EXISTS] tb_name;
+    ```
+
+- **Show all data table information under the current database**
+
+    ```mysql
+    SHOW TABLES [LIKE tb_name_wildcar];
+    ```
+    Show all data table information under the current database.
+    Note: Wildcard characters can be used to match names in like. The maximum length of this wildcard character string cannot exceed 24 bytes.
+    Wildcard matching: 1) '%' (percent sign) matches 0 to any number of characters; 2) '_' underscore matches one character.
+
+- **Modify display character width online**
+
+    ```mysql
+    SET MAX_BINARY_DISPLAY_WIDTH <nn>;
+    ```
+
+- **Get schema information of a table**
+  
+    ```mysql
+    DESCRIBE tb_name;
+    ```
+
+- **Add a column to table**
+
+   ```mysql
+   ALTER TABLE tb_name ADD COLUMN field_name data_type;
+   ```
+   Note:
+   1. The maximum number of columns is 1024 and the minimum number is 2;
+   2. The maximum length of a column name is 64; 
+
+- **Drop a column in table**
+
+   ```mysql
+   ALTER TABLE tb_name DROP COLUMN field_name; 
+   ```
+   If the table is created through a STable, the operation of table schema changing can only be carried out on the STable. Moreover, the schema changes for the STable take effect for all tables created through the schema. For tables that are not created through STables, you can modify the table schema directly.
+
+## <a class="anchor" id="super-table"></a> STable Management
+
+Note: In 2.0. 15.0 and later versions, STABLE reserved words are supported. That is, in the instruction description later in this section, the three instructions of CREATE, DROP and ALTER need to write TABLE instead of STABLE in the old version as the reserved word.
+
+- **Create a STable**
+
+    ```mysql
+    CREATE STABLE [IF NOT EXISTS] stb_name (timestamp_field_name TIMESTAMP, field1_name data_type1 [, field2_name data_type2 ...]) TAGS (tag1_name tag_type1, tag2_name tag_type2 [, tag3_name tag_type3]);
+    ```
+    Similiar to a standard table creation SQL, but you need to specify name and type of TAGS field.
+    
+    Note:
+    
+    1. Data types of TAGS column cannot be timestamp;
+    2. No duplicated TAGS column names;
+    3. Reversed word cannot be used as a TAGS column name;
+    4. The maximum number of TAGS is 128, and at least 1 TAG allowed, with a total length of no more than 16k characters.
+
+- **Drop a STable**
+
+    ```mysql
+    DROP STABLE [IF EXISTS] stb_name;
+    ```
+    Drop a STable automatically deletes all sub-tables created through the STable.
+
+- **Show all STable information under the current database**
+
+    ```mysql
+    SHOW STABLES [LIKE tb_name_wildcard];
+    ```
+    View all STables under the current database and relevant information, including name, creation time, column number, tag number, number of tables created through the STable, etc.
+
+- **Obtain schema information of a STable**
+
+    ```mysql
+    DESCRIBE stb_name;
+    ```
+
+- **Add column to STable**
+
+    ```mysql
+    ALTER STABLE stb_name ADD COLUMN field_name data_type;
+    ```
+
+- **Drop column in STable**
+
+    ```mysql
+    ALTER STABLE stb_name DROP COLUMN field_name; 
+    ```
+
+## <a class="anchor" id="tags"></a> TAG Management in STable
+
+- **Add a tag**
+
+    ```mysql
+    ALTER STABLE stb_name ADD TAG new_tag_name tag_type;
+    ```
+    Add a new tag to the STable and specify a type of the new tag. The total number of tags cannot exceed 128 and the total length does not exceed 16K characters.
+
+- **Drop a tag**
+
+    ```mysql
+    ALTER STABLE stb_name DROP TAG tag_name;
+    ```
+    Delete a tag of STable. After deleting the tag, all sub-tables under the STable will also automatically delete the same tag.
+
+- **Modify a tag name**
+
+    ```mysql
+    ALTER STABLE stb_name CHANGE TAG old_tag_name new_tag_name;
+    ```
+    Modify a tag name of STable. After modifying, all sub-tables under the STable will automatically update the new tag name.
+
+- **Modify a tag value of sub-table**
+    
+    ```mysql
+    ALTER TABLE tb_name SET TAG tag_name=new_tag_value;
+    ```
+    Note: Except that the operation of tag value updating is carried out for sub-tables, all other tag operations (adding tags, deleting tags, etc.) can only be applied to STable, and cannot be operated on a single sub-table. After adding a tag to a STable, all tables established based on that will automatically add a new tag, and the default value is NULL.
+
+## <a class="anchor" id="insert"></a> Data Writing
+
+- **Insert a record**
+
+  ```mysql
+  INSERT INTO tb_name VALUES (field_value, ...);
+  ```
+  Insert a record into table tb_name.
+
+- **Insert a record with data corresponding to a given column**
+   
+    ```mysql
+    INSERT INTO tb_name (field1_name, ...) VALUES (field1_value1, ...);
+    ```
+    Insert a record into table tb_name, and the data corresponds to a given column. For columns that do not appear in the SQL statement, database will automatically populate them with NULL. Primary key (timestamp) cannot be NULL.
+
+- **Insert multiple records**
+
+    ```mysql
+    INSERT INTO tb_name VALUES (field1_value1, ...) (field1_value2, ...) ...;
+    ```
+    Insert multiple records into table tb_name.
+
+- **Insert multiple records into a given column**
+    
+    ```mysql
+    INSERT INTO tb_name (field1_name, ...) VALUES (field1_value1, ...) (field1_value2, ...) ...;
+    ```
+    Insert multiple records into a given column of table tb_name.
+
+- **Insert multiple records into multiple tables**
+    
+    ```mysql
+    INSERT INTO tb1_name VALUES (field1_value1, ...) (field1_value2, ...) ...
+                tb2_name VALUES (field1_value1, ...) (field1_value2, ...) ...;
+    ```
+    Insert multiple records into tables tb1_name and tb2_name at the same time.
+
+- **Insert multiple records per column into multiple tables**
+
+    ```mysql
+    INSERT INTO tb1_name (tb1_field1_name, ...) VALUES (field1_value1, ...) (field1_value2, ...) ...
+                tb2_name (tb2_field1_name, ...) VALUES (field1_value1, ...) (field1_value2, ...) ...;
+    ```
+    Insert multiple records per column into tables tb1_name and tb2_name at the same time.
+    Note: The timestamp of the oldest record allowed to be inserted is relative to the current server time, minus the configured keep value (days of data retention), and the timestamp of the latest record allowed to be inserted is relative to the current server time, plus the configured days value (interval of data storage in the data file, in days). Both keep and days can be specified when the database is created, and the default values are 3650 days and 10 days, respectively.
+
+- <a class="anchor" id="auto_create_table"></a> Automatically create a table when inserting
+
+    ```mysql
+    INSERT INTO tb_name USING stb_name TAGS (tag_value1, ...) VALUES (field_value1, ...);
+    ```
+    If user is not sure whether a table exists when writing data, the automatic table building syntax can be used to create a non-existent table when writing. If the table already exists, no new table will be created. When automatically creating a table, it is required to use the STable as a template and specify tags value for the data table.
+
+- **Automatically create a table when inserting, and specify a given tags column**
+  
+    ```mysql
+    INSERT INTO tb_name USING stb_name (tag_name1, ...) TAGS (tag_value1, ...) VALUES (field_value1, ...);
+    ```
+    During automatic table creation, only the values of some tags columns can be specified, and the unspecified tags columns will be null.
+
+**History writing**: The IMPORT or INSERT command can be used. The syntax and function of IMPORT are exactly the same as those of INSERT.
+
+Note: For SQL statements in insert type, the stream parsing strategy we adopt will still execute the correct part of SQL before the following errors are found. In the following sql, insert statement is invalid, but d1001 will still be created.
+
+```mysql
+taos> CREATE TABLE meters(ts TIMESTAMP, current FLOAT, voltage INT, phase FLOAT) TAGS(location BINARY(30), groupId INT);
+Query OK, 0 row(s) affected (0.008245s)
+
+taos> SHOW STABLES;
+              name              |      created_time       | columns |  tags  |   tables    |
+============================================================================================
+ meters                         | 2020-08-06 17:50:27.831 |       4 |      2 |           0 |
+Query OK, 1 row(s) in set (0.001029s)
+
+taos> SHOW TABLES;
+Query OK, 0 row(s) in set (0.000946s)
+
+taos> INSERT INTO d1001 USING meters TAGS('Beijing.Chaoyang', 2) VALUES('a');
+
+DB error: invalid SQL: 'a' (invalid timestamp) (0.039494s)
+
+taos> SHOW TABLES;
+           table_name           |      created_time       | columns |          stable_name           |
+======================================================================================================
+ d1001                          | 2020-08-06 17:52:02.097 |       4 | meters                         |
+Query OK, 1 row(s) in set (0.001091s)
+```
+
+## <a class="anchor" id="select"></a> Data Query
+
+### Query Syntax:
+
+```mysql
+SELECT select_expr [, select_expr ...]
+    FROM {tb_name_list}
+    [WHERE where_condition]
+    [INTERVAL (interval_val [, interval_offset])]
+    [SLIDING sliding_val]
+    [FILL fill_val]
+    [GROUP BY col_list]
+    [ORDER BY col_list { DESC | ASC }]
+    [SLIMIT limit_val [SOFFSET offset_val]]
+    [LIMIT limit_val [OFFSET offset_val]]
+    [>> export_file];
+```
+
+#### SELECT Clause
+
+A select clause can be a subquery of UNION and another query.
+
+#### Wildcard character
+
+The wildcard \* can be used to refer to all columns. For ordinary tables, there’re only ordinary columns in results.
+
+```mysql
+taos> SELECT * FROM d1001;
+           ts            |       current        |   voltage   |        phase         |
+======================================================================================
+ 2018-10-03 14:38:05.000 |             10.30000 |         219 |              0.31000 |
+ 2018-10-03 14:38:15.000 |             12.60000 |         218 |              0.33000 |
+ 2018-10-03 14:38:16.800 |             12.30000 |         221 |              0.31000 |
+Query OK, 3 row(s) in set (0.001165s)
+```
+
+For Stables, wildcards contain *tag columns*.
+
+```mysql
+taos> SELECT * FROM meters;
+           ts            |       current        |   voltage   |        phase         |            location            |   groupid   |
+=====================================================================================================================================
+ 2018-10-03 14:38:05.500 |             11.80000 |         221 |              0.28000 | Beijing.Haidian                |           2 |
+ 2018-10-03 14:38:16.600 |             13.40000 |         223 |              0.29000 | Beijing.Haidian                |           2 |
+ 2018-10-03 14:38:05.000 |             10.80000 |         223 |              0.29000 | Beijing.Haidian                |           3 |
+ 2018-10-03 14:38:06.500 |             11.50000 |         221 |              0.35000 | Beijing.Haidian                |           3 |
+ 2018-10-03 14:38:04.000 |             10.20000 |         220 |              0.23000 | Beijing.Chaoyang               |           3 |
+ 2018-10-03 14:38:16.650 |             10.30000 |         218 |              0.25000 | Beijing.Chaoyang               |           3 |
+ 2018-10-03 14:38:05.000 |             10.30000 |         219 |              0.31000 | Beijing.Chaoyang               |           2 |
+ 2018-10-03 14:38:15.000 |             12.60000 |         218 |              0.33000 | Beijing.Chaoyang               |           2 |
+ 2018-10-03 14:38:16.800 |             12.30000 |         221 |              0.31000 | Beijing.Chaoyang               |           2 |
+Query OK, 9 row(s) in set (0.002022s)
+```
+
+Wildcards support table name prefixes, the two following SQL statements will return all columns:
+
+```mysql
+SELECT * FROM d1001;
+SELECT d1001.* FROM d1001;
+```
+
+In Join query, the results returned by \* with prefix and \* without prefix are different. \* returns all column data of all tables (excluding tags), while wildcards with prefix only return column data of the corresponding table.
+
+```mysql
+taos> SELECT * FROM d1001, d1003 WHERE d1001.ts=d1003.ts;
+           ts            | current |   voltage   |    phase     |           ts            | current |   voltage   |    phase     |
+==================================================================================================================================
+ 2018-10-03 14:38:05.000 | 10.30000|         219 |      0.31000 | 2018-10-03 14:38:05.000 | 10.80000|         223 |      0.29000 |
+Query OK, 1 row(s) in set (0.017385s)
+```
+```mysql
+taos> SELECT d1001.* FROM d1001,d1003 WHERE d1001.ts = d1003.ts;
+           ts            |       current        |   voltage   |        phase         |
+======================================================================================
+ 2018-10-03 14:38:05.000 |             10.30000 |         219 |              0.31000 |
+Query OK, 1 row(s) in set (0.020443s)
+```
+
+In the process of using SQL functions for query, some SQL functions support wildcard operation. The difference is that the `count(\*)` function returns only one column, but the `first`,`last`,`last_row` functions return all columns.
+
+```mysql
+taos> SELECT COUNT(*) FROM d1001;
+       count(*)        |
+========================
+                     3 |
+Query OK, 1 row(s) in set (0.001035s)
+```
+
+```mysql
+taos> SELECT FIRST(*) FROM d1001;
+        first(ts)        |    first(current)    | first(voltage) |     first(phase)     |
+=========================================================================================
+ 2018-10-03 14:38:05.000 |             10.30000 |            219 |              0.31000 |
+Query OK, 1 row(s) in set (0.000849s)
+```
+
+####  Tag Column
+
+Since version 2.0. 14, it is supported to specify *tag column* in queries of ordinary tables, and the values of tag columns will be returned together with the data of other ordinary columns.
+
+```mysql
+taos> SELECT location, groupid, current FROM d1001 LIMIT 2;
+            location            |   groupid   |       current        |
+======================================================================
+ Beijing.Chaoyang               |           2 |             10.30000 |
+ Beijing.Chaoyang               |           2 |             12.60000 |
+Query OK, 2 row(s) in set (0.003112s)
+```
+
+Note: The wildcard \* of ordinary tables does not contain *tag columns*.
+
+#### Obtain the de-duplicated value of a tag column
+
+Since version 2.0. 15, it is supported to specify `DISTINCT` keyword when querying tag columns in STables, which will return all non-duplicate values of given tag columns.
+
+```mysql
+SELECT DISTINCT tag_name FROM stb_name;
+```
+
+Note: At present, `DISTINCT` keyword only supports deduplication of tag columns of STables, and cannot be used for ordinary columns.
+
+#### Column name in result set
+
+In `SELECT` clause, if there’s no returning of column name in result set, the result set column name defaults to the expression name in `SELECT` clause as the column name. In addition, user can use `AS` to rename the columns in the returned result set. For example:
+
+```mysql
+taos> SELECT ts, ts AS primary_key_ts FROM d1001;
+           ts            |     primary_key_ts      |
+====================================================
+ 2018-10-03 14:38:05.000 | 2018-10-03 14:38:05.000 |
+ 2018-10-03 14:38:15.000 | 2018-10-03 14:38:15.000 |
+ 2018-10-03 14:38:16.800 | 2018-10-03 14:38:16.800 |
+Query OK, 3 row(s) in set (0.001191s)
+```
+
+However, renaming for one single column is not supported for `first(*)`,`last(*)`,`last_row(*)`.
+
+#### Implicit result column
+
+`Select_exprs` can be the name of a column belongs to a table, or it can be a column-based functional expression or calculation formula, with an upper limit of 256. When user uses `interval` or `group by tags` clause, the timestamp column (the first column) and the tag column in `group by` clause are forced to be returned in the final returned result. Later versions can support turning off the output of implicit columns in `group by` clause, and the column output is completely controlled by select clause.
+
+#### List of STable
+
+The `FROM` keyword can be followed by a list of several tables (STables) or result of a subquery. 
+
+If you do not specify user's current database, you can use the database name before the table name to specify the database to which the table belongs. For example: `power.d1001` to use tables across databases.
+
+```mysql
+SELECT * FROM power.d1001;
+------------------------------
+USE power;
+SELECT * FROM d1001;
+```
+
+#### Special Functions
+
+Some special query functions can be performed without using FROM clause. Obtain the current database database ():
+
+```mysql
+taos> SELECT DATABASE();
+           database()           |
+=================================
+ power                          |
+Query OK, 1 row(s) in set (0.000079s)
+```
+
+If no default database is specified when logging in, and `USE` command is not used to switch data, then `NULL` is returned.
+
+```mysql
+taos> SELECT DATABASE();
+           database()           |
+=================================
+ NULL                           |
+Query OK, 1 row(s) in set (0.000184s)
+```
+
+Get server and client version numbers:
+
+```mysql
+taos> SELECT CLIENT_VERSION();
+ client_version() |
+===================
+ 2.0.0.0          |
+Query OK, 1 row(s) in set (0.000070s)
+
+taos> SELECT SERVER_VERSION();
+ server_version() |
+===================
+ 2.0.0.0          |
+Query OK, 1 row(s) in set (0.000077s)
+```
+
+A server state detection statement. If server is normal, return a number (for example, 1). If server is exceptional, return error code. The SQL syntax can be compatible with the check of TDengine status by connection pool and the check of database server status by third-party tools. And can avoid connection loss of connection pool caused by using a wrong heartbeat detection SQL statement.
+
+```mysql
+taos> SELECT SERVER_STATUS();
+ server_status() |
+==================
+               1 |
+Query OK, 1 row(s) in set (0.000074s)
+
+taos> SELECT SERVER_STATUS() AS status;
+   status    |
+==============
+           1 |
+Query OK, 1 row(s) in set (0.000081s)
+```
+
+#### Special keywords in TAOS SQL
+
+>  `TBNAME`: It can be regarded as a special tag in a STable query, representing the name of sub-table involved in the query
+>
+> _c0: Represents the first column of a table (STable)
+
+#### Tips
+
+Get all sub-table names and related tags information of a STable:
+
+```mysql
+SELECT TBNAME, location FROM meters;
+```
+
+Statistics of sub-tables number under a STable:
+
+```mysql
+SELECT COUNT(TBNAME) FROM meters;
+```
+
+The  two queries above only support adding filters for TAGS in Where conditional clause. For example:
+
+```mysql
+taos> SELECT TBNAME, location FROM meters;
+             tbname             |            location            |
+==================================================================
+ d1004                          | Beijing.Haidian                |
+ d1003                          | Beijing.Haidian                |
+ d1002                          | Beijing.Chaoyang               |
+ d1001                          | Beijing.Chaoyang               |
+Query OK, 4 row(s) in set (0.000881s)
+
+taos> SELECT COUNT(tbname) FROM meters WHERE groupId > 2;
+     count(tbname)     |
+========================
+                     2 |
+Query OK, 1 row(s) in set (0.001091s)
+```
+
+- You can use \* to return all columns, or given column names. Four operations can be performed on numeric columns, and column names can be given to output columns.
+- `WHERE` statement can use various logical decisions to filter numeric values, or wildcards to filter strings
+- The output is sorted by default in ascending order by timestamps in the first column, but you can specify descending order (\_c0 refers to the first column timestamp). It is illegal to use ORDER BY to sort other fields.
+- Parameter LIMIT controls the number of outputs, and OFFSET specifies which output starts from. LIMIT/OFFSET executes the result set after ORDER BY.
+- "> >" output can be exported to a specified file
+
+#### Supported Filtering Operations
+
+| **Operation** | **Note**                      | **Applicable Data Types**           |
+| ------------- | ----------------------------- | ----------------------------------- |
+| >             | larger than                   | **timestamp** and all numeric types |
+| <             | smaller than                  | **timestamp** and all numeric types |
+| >=            | larger than or equal to       | **timestamp** and all numeric types |
+| <=            | smaller than or equal to      | **timestamp** and all numeric types |
+| =             | equal to                      | all types                           |
+| <>            | not equal to                  | all types                           |
+| between and   | within a certain range        | **timestamp** and all numeric types |
+| %             | match with any char sequences | **binary** **nchar**                |
+| _             | match with a single char      | **binary** **nchar**                |
+
+1. To filter the range of multiple fields at the same time, you need to use keyword AND to connect different query conditions. The query filtering between different columns connected by OR are not supported at the moment.
+2. For filtering a single field, if it is a time filtering condition, only one condition in a statement can be set; however, for other (ordinary) columns or tag columns, OR keyword can be used for query filtering of combined conditions. For example: ((value > 20 AND value < 30) OR (value < 12)).
+3. Since version 2.0. 17, condition filtering supports BETWEEN AND syntax. For example, WHERE col2 BETWEEN 1.5 AND 3.25 means that the query condition is "1.5 ≤ col2 ≤ 3.25".
+
+### SQL Example
+
+- For example, table tb1 is created with the following statement
+  
+    ```mysql
+    CREATE TABLE tb1 (ts TIMESTAMP, col1 INT, col2 FLOAT, col3 BINARY(50));
+    ```
+
+- Query all records of the last hour of tb1
+
+    ```mysql
+    SELECT * FROM tb1 WHERE ts >= NOW - 1h;
+    ```
+
+- Look up table tb1 from 2018-06-01 08:00:00. 000 to 2018-06-02 08:00:00. 000, and col3 string is a record ending in'nny ', and the result is in descending order of timestamp:
+
+    ```mysql
+    SELECT * FROM tb1 WHERE ts > '2018-06-01 08:00:00.000' AND ts <= '2018-06-02 08:00:00.000' AND col3 LIKE '%nny' ORDER BY ts DESC;
+    ```
+
+- Query the sum of col1 and col2, and name it complex. The time is greater than 2018-06-01 08:00:00. 000, and col2 is greater than 1.2. As a result, only 10 records are outputted, starting from item 5
+
+    ```mysql
+    SELECT (col1 + col2) AS 'complex' FROM tb1 WHERE ts > '2018-06-01 08:00:00.000' AND col2 > 1.2 LIMIT 10 OFFSET 5;
+    ```
+
+- Query the records of past 10 minutes, the value of col2 is greater than 3.14, and output the result to the file /home/testoutpu.csv.
+
+    ```mysql
+    SELECT COUNT(*) FROM tb1 WHERE ts >= NOW - 10m AND col2 > 3.14 >> /home/testoutpu.csv;
+    ```
+
+<a class="anchor" id="functions"></a>
+
+## SQL Functions
+
+TDengine supports aggregations over data, they are listed below:
+
+- **COUNT**
+
+    ```mysql
+    SELECT COUNT([*|field_name]) FROM tb_name [WHERE clause];
+    ```
+    Function: record the number of rows or non-null values in a column of statistics/STable.
+    
+    Returned result data type: long integer INT64.
+    
+    Applicable Fields: Applied to all fields.
+    
+    Applied to: **table, STable**.
+    
+    Note:
+    1. You can use \* instead of specific fields, and use *() to return the total number of records.
+    2. The query results for fields of the same table (excluding NULL values) are the same.
+    3. If the statistic object is a specific column, return the number of records with non-NULL values in that column.
+    
+    Example:
+    
+    ```mysql
+    taos> SELECT COUNT(*), COUNT(voltage) FROM meters;
+        count(*)        |    count(voltage)     |
+    ================================================
+                        9 |                     9 |
+    Query OK, 1 row(s) in set (0.004475s)
+  
+    taos> SELECT COUNT(*), COUNT(voltage) FROM d1001;
+        count(*)        |    count(voltage)     |
+    ================================================
+                        3 |                     3 |
+    Query OK, 1 row(s) in set (0.001075s)
+    ```
+
+- **AVG**
+
+  ```mysql
+  SELECT AVG(field_name) FROM tb_name [WHERE clause];
+  ```
+  Function: return the average value of a column in statistics/STable.
+  
+  Return Data Type: double.
+  
+  Applicable Fields: all types except timestamp, binary, nchar, bool.
+  
+  Applied to: **table,STable**.
+  
+  Example:
+  
+  ```mysql
+  taos> SELECT AVG(current), AVG(voltage), AVG(phase) FROM meters;
+      avg(current)        |       avg(voltage)        |        avg(phase)         |
+  ====================================================================================
+              11.466666751 |             220.444444444 |               0.293333333 |
+  Query OK, 1 row(s) in set (0.004135s)
+  
+  taos> SELECT AVG(current), AVG(voltage), AVG(phase) FROM d1001;
+      avg(current)        |       avg(voltage)        |        avg(phase)         |
+  ====================================================================================
+              11.733333588 |             219.333333333 |               0.316666673 |
+  Query OK, 1 row(s) in set (0.000943s)
+  ```
+
+- **TWA**
+   
+  ```mysql
+  SELECT TWA(field_name) FROM tb_name WHERE clause;
+  ```
+  
+  Function: Time weighted average function. The time-weighted average of a column in a statistical table over a period of time.
+  
+  Return Data Type: double.
+  
+  Applicable Fields: all types except timestamp, binary, nchar, bool.
+  
+  Applied to: **table**.
+
+- **SUM**
+
+  ```mysql
+  SELECT SUM(field_name) FROM tb_name [WHERE clause];
+  ```
+  
+  Function: return the sum of a statistics/STable.
+  
+  Return Data Type: long integer INMT64 and Double.
+  
+  Applicable Fields: All types except timestamp, binary, nchar, bool.
+  
+  Applied to:  **table,STable**.
+  
+  Example:
+
+  ```mysql
+  taos> SELECT SUM(current), SUM(voltage), SUM(phase) FROM meters;
+      sum(current)        |     sum(voltage)      |        sum(phase)         |
+  ================================================================================
+              103.200000763 |                  1984 |               2.640000001 |
+  Query OK, 1 row(s) in set (0.001702s)
+  
+  taos> SELECT SUM(current), SUM(voltage), SUM(phase) FROM d1001;
+      sum(current)        |     sum(voltage)      |        sum(phase)         |
+  ================================================================================
+              35.200000763 |                   658 |               0.950000018 |
+  Query OK, 1 row(s) in set (0.000980s)
+   ```
+
+- **STDDEV**
+  
+  ```mysql
+  SELECT STDDEV(field_name) FROM tb_name [WHERE clause];
+  ```
+  
+  Function: Mean square deviation of a column in statistics table.
+  
+  Return Data Type: Double.
+  
+  Applicable Fields: All types except timestamp, binary, nchar, bool.
+  
+  Applied to: **table**. (also support **STable** since version 2.0.15.1)
+  
+  Example:
+  
+  ```mysql
+  taos> SELECT STDDEV(current) FROM d1001;
+      stddev(current)      |
+  ============================
+              1.020892909 |
+  Query OK, 1 row(s) in set (0.000915s)
+  ```
+
+- **LEASTSQUARES**
+    ```mysql
+    SELECT LEASTSQUARES(field_name, start_val, step_val) FROM tb_name [WHERE clause];
+    ```
+    Function: Value of a column in statistical table is a fitting straight equation of primary key (timestamp). Start_val is the initial value of independent variable, and step_val is the step size value of independent variable.
+    
+    Return Data Type: String expression (slope, intercept).
+    
+    Applicable Fields: All types except timestamp, binary, nchar, bool.
+    
+    Note: Independent variable is the timestamp, and dependent variable is the value of the column.
+    
+    Applied to: **table**.
+    
+    Example:
+    ```mysql
+    taos> SELECT LEASTSQUARES(current, 1, 1) FROM d1001;
+                leastsquares(current, 1, 1)             |
+    =====================================================
+    {slop:1.000000, intercept:9.733334}                 |
+    Query OK, 1 row(s) in set (0.000921s)
+    ```
+
+### Selector Functions
+
+- **MIN**
+    ```mysql
+    SELECT MIN(field_name) FROM {tb_name | stb_name} [WHERE clause];
+    ```
+    Function: return the minimum value of a specific column in statistics/STable.
+    
+    Return Data Type: Same as applicable fields.
+    
+    Applicable Fields: All types except timestamp, binary, nchar, bool.
+    
+    Example:
+
+    ```mysql
+    taos> SELECT MIN(current), MIN(voltage) FROM meters;
+        min(current)     | min(voltage) |
+    ======================================
+                10.20000 |          218 |
+    Query OK, 1 row(s) in set (0.001765s)
+    
+    taos> SELECT MIN(current), MIN(voltage) FROM d1001;
+        min(current)     | min(voltage) |
+    ======================================
+                10.30000 |          218 |
+    Query OK, 1 row(s) in set (0.000950s)
+    ```
+
+- **MAX**
+
+   ```mysql
+   SELECT MAX(field_name) FROM { tb_name | stb_name } [WHERE clause];
+   ```
+   
+   Function: return the maximum value of a specific column in statistics/STable.
+   
+   Return Data Type: Same as applicable fields.
+   
+   Applicable Fields: All types except timestamp, binary, nchar, bool.
+   
+   Example:
+
+   ```mysql
+   taos> SELECT MAX(current), MAX(voltage) FROM meters;
+       max(current)     | max(voltage) |
+   ======================================
+               13.40000 |          223 |
+   Query OK, 1 row(s) in set (0.001123s)
+  
+   taos> SELECT MAX(current), MAX(voltage) FROM d1001;
+       max(current)     | max(voltage) |
+   ======================================
+               12.60000 |          221 |
+   Query OK, 1 row(s) in set (0.000987s)
+   ```
+
+- **FIRST**
+
+   ```mysql
+   SELECT FIRST(field_name) FROM { tb_name | stb_name } [WHERE clause];
+   ```
+   
+   Function: The first non-NULL value written into a column in statistics/STable.
+   
+   Return Data Type: Same as applicable fields.
+   
+   Applicable Fields: All types.
+   
+   Note:
+   1. To return the first (minimum timestamp) non-NULL value of each column, use FIRST (\*);
+   2. if all columns in the result set are NULL values, the return result of the column is also NULL;
+   3. If all columns in the result set are NULL values, no result is returned.
+   
+   Example:
+
+   ```mysql
+   taos> SELECT FIRST(*) FROM meters;
+          first(ts)        |    first(current)    | first(voltage) |     first(phase)     |
+   =========================================================================================
+   2018-10-03 14:38:04.000 |             10.20000 |            220 |              0.23000 |
+   Query OK, 1 row(s) in set (0.004767s)
+
+   taos> SELECT FIRST(current) FROM d1002;
+         first(current)    |
+   =======================
+                10.20000 |
+   Query OK, 1 row(s) in set (0.001023s)
+   ```
+
+- 
+
+- **LAST**
+
+   ```mysql
+   SELECT LAST(field_name) FROM { tb_name | stb_name } [WHERE clause];
+   ```
+   
+   Function: The last non-NULL value written by the value of a column in statistics/STable.
+   
+   Return Data Type: Same as applicable fields.
+   
+   Applicable Fields: All types.
+   
+   Note:
+   1. To return the last (maximum timestamp) non-NULL value of each column, use LAST (\*);
+   2. If a column in the result set has a NULL value, the returned result of the column is also NULL; if all columns in the result set have NULL values, no result is returned.
+   
+   Example:
+
+   ```mysql
+    taos> SELECT LAST(*) FROM meters;
+            last(ts)         |    last(current)     | last(voltage) |     last(phase)      |
+    ========================================================================================
+    2018-10-03 14:38:16.800 |             12.30000 |           221 |              0.31000 |
+    Query OK, 1 row(s) in set (0.001452s)
+
+    taos> SELECT LAST(current) FROM d1002;
+        last(current)     |
+    =======================
+                10.30000 |
+    Query OK, 1 row(s) in set (0.000843s)
+   ```
+
+- **TOP**
+   
+    ```mysql
+    SELECT TOP(field_name, K) FROM { tb_name | stb_name } [WHERE clause];
+    ```
+    Function: The top k non-NULL values of a column in statistics/STable. If there are more than k column values tied for the largest, the one with smaller timestamp is returned.
+    
+    Return Data Type: Same as applicable fields.
+    
+    Applicable Fields: All types except timestamp, binary, nchar, bool.
+    
+    Note:
+    1. The range of *k* value is 1≤*k*≤100;
+    2. System also returns the timestamp column associated with the record.
+    
+    Example:
+
+    ```mysql
+    taos> SELECT TOP(current, 3) FROM meters;
+            ts            |   top(current, 3)    |
+    =================================================
+    2018-10-03 14:38:15.000 |             12.60000 |
+    2018-10-03 14:38:16.600 |             13.40000 |
+    2018-10-03 14:38:16.800 |             12.30000 |
+    Query OK, 3 row(s) in set (0.001548s)
+      
+    taos> SELECT TOP(current, 2) FROM d1001;
+            ts            |   top(current, 2)    |
+    =================================================
+    2018-10-03 14:38:15.000 |             12.60000 |
+    2018-10-03 14:38:16.800 |             12.30000 |
+    Query OK, 2 row(s) in set (0.000810s)
+    ```
+
+- **BOTTOM**
+
+    ```mysql
+    SELECT BOTTOM(field_name, K) FROM { tb_name | stb_name } [WHERE clause];
+    ```
+    Function: The last k non-NULL values of a column in statistics/STable. If there are more than k column values tied for the smallest, the one with smaller timestamp is returned.
+    
+    Return Data Type: Same as applicable fields.
+    
+    Applicable Fields: All types except timestamp, binary, nchar, bool.
+
+    Note:
+    1. The range of *k* value is 1≤*k*≤100;
+    2. System also returns the timestamp column associated with the record.
+
+    Example:
+
+    ```mysql
+    taos> SELECT BOTTOM(voltage, 2) FROM meters;
+            ts            | bottom(voltage, 2) |
+    ===============================================
+    2018-10-03 14:38:15.000 |                218 |
+    2018-10-03 14:38:16.650 |                218 |
+    Query OK, 2 row(s) in set (0.001332s)
+  
+    taos> SELECT BOTTOM(current, 2) FROM d1001;
+            ts            |  bottom(current, 2)  |
+    =================================================
+    2018-10-03 14:38:05.000 |             10.30000 |
+    2018-10-03 14:38:16.800 |             12.30000 |
+    Query OK, 2 row(s) in set (0.000793s)
+    ```
+
+- **PERCENTILE**
+    ```mysql
+    SELECT PERCENTILE(field_name, P) FROM { tb_name } [WHERE clause];
+    ```
+    Function: Percentile of the value of a column in statistical table.
+    
+    Return Data Type: Double.
+    
+    Applicable Fields: All types except timestamp, binary, nchar, bool.
+    
+    Note: The range of P value is 0 ≤ P ≤ 100. P equals to MIN when, and equals MAX when it’s 100.
+    
+    Example:
+
+    ```mysql
+    taos> SELECT PERCENTILE(current, 20) FROM d1001;
+    percentile(current, 20)  |
+    ============================
+                11.100000191 |
+    Query OK, 1 row(s) in set (0.000787s)
+    ```
+
+- **APERCENTILE**
+    ```mysql
+    SELECT APERCENTILE(field_name, P) FROM { tb_name | stb_name } [WHERE clause];
+    ```
+    Function: The value percentile of a column in statistical table is similar to the PERCENTILE function, but returns approximate results.
+    
+    Return Data Type: Double.
+    
+    Applicable Fields: All types except timestamp, binary, nchar, bool.
+    
+    Note: The range of *P* value is 0 ≤ *P* ≤ 100. *P* equals to MIN when, and equals MAX when it’s 100. APERCENTILE function is recommended, which performs far better than PERCENTILE function.
+
+- **LAST_ROW**
+    ```mysql
+    SELECT LAST_ROW(field_name) FROM { tb_name | stb_name };
+    ```
+    Function: Return the last record of a table (STtable).
+    
+    Return Data Type: Double.
+    
+    Applicable Fields: All types.
+    
+    Note: Unlike last function, last_row does not support time range restriction and forces the last record to be returned.
+    
+    Example:
+
+    ```mysql
+    taos> SELECT LAST_ROW(current) FROM meters;
+    last_row(current)   |
+    =======================
+                12.30000 |
+    Query OK, 1 row(s) in set (0.001238s)
+  
+    taos> SELECT LAST_ROW(current) FROM d1002;
+    last_row(current)   |
+    =======================
+                10.30000 |
+      Query OK, 1 row(s) in set (0.001042s)
+    ```
+
+### Computing Functions
+
+- **DIFF**
+    ```mysql
+    SELECT DIFF(field_name) FROM tb_name [WHERE clause];
+    ```
+    Function: Return the value difference between a column and the previous column.
+    
+    Return Data Type: Same as applicable fields.
+    
+    Applicable Fields: All types except timestamp, binary, nchar, bool.
+    
+    Note: The number of output result lines is the total number of lines in the range minus one, and there is no result output in the first line.
+    
+    Example:
+
+    ```mysql
+    taos> SELECT DIFF(current) FROM d1001;
+            ts            |    diff(current)     |
+    =================================================
+    2018-10-03 14:38:15.000 |              2.30000 |
+    2018-10-03 14:38:16.800 |             -0.30000 |
+    Query OK, 2 row(s) in set (0.001162s)
+    ```
+
+- **SPREAD**
+
+    ```mysql
+    SELECT SPREAD(field_name) FROM { tb_name | stb_name } [WHERE clause];
+    ```
+    Function: Return the difference between the max value and the min value of a column in statistics /STable.
+    
+    Return Data Type: Same as applicable fields.
+    
+    Applicable Fields: All types except binary, nchar, bool.
+    
+    Note: Applicable for TIMESTAMP field, which indicates the time range of a record.
+    
+    Example:
+
+    ```mysql
+    taos> SELECT SPREAD(voltage) FROM meters;
+        spread(voltage)      |
+    ============================
+                5.000000000 |
+    Query OK, 1 row(s) in set (0.001792s)
+  
+    taos> SELECT SPREAD(voltage) FROM d1001;
+        spread(voltage)      |
+    ============================
+                3.000000000 |
+    Query OK, 1 row(s) in set (0.000836s)
+    ```
+
+- **Four Operations**
+
+    ```mysql
+    SELECT field_name [+|-|*|/|%][Value|field_name] FROM { tb_name | stb_name }  [WHERE clause];
+    ```
+    Function: Calculation results of addition, subtraction, multiplication, division and remainder of values in a column or among multiple columns in statistics/STable.
+    
+    Returned Data Type: Double.
+    
+    Applicable Fields: All types except timestamp, binary, nchar, bool.
+    
+    Note: 
+    
+    1. Calculation between two or more columns is supported, and the calculation priorities can be controlled by parentheses();
+    2. The NULL field does not participate in the calculation. If a row involved in calculation contains NULL, the calculation result of the row is NULL.
+
+## <a class="anchor" id="aggregation"></a> Time-dimension Aggregation
+
+TDengine supports aggregating by intervals. Data in a table can partitioned by intervals and aggregated to generate results. For example, a temperature sensor collects data once per second, but the average temperature needs to be queried every 10 minutes. This aggregation is suitable for down sample operation, and the syntax is as follows:
+
+```mysql
+SELECT function_list FROM tb_name
+  [WHERE where_condition]
+  INTERVAL (interval [, offset])
+  [SLIDING sliding]
+  [FILL ({NONE | VALUE | PREV | NULL | LINEAR | NEXT})]
+
+SELECT function_list FROM stb_name
+  [WHERE where_condition]
+  INTERVAL (interval [, offset])
+  [SLIDING sliding]
+  [FILL ({ VALUE | PREV | NULL | LINEAR | NEXT})]
+  [GROUP BY tags]
+```
+
+- The length of aggregation interval is specified by keyword INTERVAL, the min time interval is 10 milliseconds (10a), and offset is supported (the offset must be less than interval). In aggregation queries, the aggregator and selector functions that can be executed simultaneously are limited to functions with one single output: count, avg, sum, stddev, leastsquares, percentile, min, max, first, last. Functions with multiple rows of output results (such as top, bottom, diff, and four operations) cannot be used.
+
+- WHERE statement specifies the start and end time of a query and other filters
+
+- FILL statement specifies a filling mode when data missed in a certain interval. Applicable filling modes include the following:
+  
+  1. Do not fill: NONE (default filingl mode).
+  2. VALUE filling: Fixed value filling, where the filled value needs to be specified. For example: fill (VALUE, 1.23).
+  3. NULL filling: Fill the data with NULL. For example: fill (NULL).
+  4. PREV filling: Filling data with the previous non-NULL value. For example: fill (PREV).
+  5. NEXT filling: Filling data with the next non-NULL value. For example: fill (NEXT).
+
+Note:
+
+  1. When using a FILL statement, a large number of filling outputs may be generated. Be sure to specify the time interval for the query. For each query, system can return no more than 10 million results with interpolation.
+  2. In a time-dimension aggregation, the time-series in returned results increases strictly monotonously.
+  3. If the query object is a STable, the aggregator function will act on the data of all tables under the STable that meet the value filters. If group by statement is not used in the query, the returned result increases strictly monotonously according to time-series; If group by statement is used to group in the query, each group in the returned result does not increase strictly monotonously according to time-series.
+
+Example: The statement for building a database for smart meter is as follows:
+
+```mysql
+CREATE TABLE meters (ts TIMESTAMP, current FLOAT, voltage INT, phase FLOAT) TAGS (location BINARY(64), groupId INT);
+```
+
+According to the data collected by the smart meter, the average value, maximum value, median current of current data in the past 24 hours are calculated in a phase of 10 minutes, and the current trend with time changes is fitted to a straight line. If there is no calculated value, fill it with the previous non-NULL value. The query statement used is as follows:
+
+```mysql
+SELECT AVG(current), MAX(current), LEASTSQUARES(current, start_val, step_val), PERCENTILE(current, 50) FROM meters
+  WHERE ts>=NOW-1d
+  INTERVAL(10m)
+  FILL(PREV);
+```
+
+## <a class="anchor" id="limitation"></a> TAOS SQL Boundary Restrictions
+
+- Max database name length is 32
+- Max length of table name is 192, and max length of each data row is 16k characters
+- Max length of column name is 64, max number of columns allowed is 1024, and min number of columns allowed is 2. The first column must be a timestamp
+- Max number of tags allowed is 128, down to 1, and total length of tags does not exceed 16k characters
+- Max length of SQL statement is 65480 characters, but it can be modified by system configuration parameter maxSQLLength, and max length can be configured to 1M
+- Number of databases, STables and tables are not limited by system, but only limited by system resources
+
+## Other TAOS SQL Conventions
+
+**Restrictions on group by**
+
+TAOS SQL supports group by operation on tags, tbnames and ordinary columns, required that only one column and whichhas less than 100,000 unique values.
+
+**Restrictions on join operation**
+
+TAOS SQL supports join columns of two tables by Primary Key timestamp between them, and does not support four operations after tables aggregated for the time being.
+
+**Availability of is no null**
+
+Is not null supports all types of columns. Non-null expression is < > "" and only applies to columns of non-numeric types.
diff --git a/documentation20/en/13.faq/docs.md b/documentation20/en/13.faq/docs.md
new file mode 100644
index 0000000000000000000000000000000000000000..05507e26e5ab84a01e19d9ecced5e0464c1411f3
--- /dev/null
+++ b/documentation20/en/13.faq/docs.md
@@ -0,0 +1,161 @@
+# FAQ
+
+Tutorials & FAQ
+
+## 0.How to report an issue?
+
+If the contents in FAQ cannot help you and you need the technical support and assistance of TDengine team, please package the contents in the following two directories:
+
+1./var/log/taos (if default path has not been modified)
+
+2./etc/taos
+
+Provide the necessary description of the problem, including the version information of TDengine used, the platform environment information, the execution operation of the problem, the characterization of the problem and the approximate time, and submit the Issue on [GitHub](https://github.com/taosdata/TDengine).
+
+To ensure that there is enough debug information, if the problem can be repeated, please modify the/etc/taos/taos.cfg file, add a line of "debugFlag 135" at the end (without quotation marks themselves), then restart taosd, repeat the problem, and then submit. You can also temporarily set the log level of taosd through the following SQL statement.
+
+```
+    alter dnode <dnode_id> debugFlag 135;
+```
+
+However, when the system is running normally, please set debugFlag to 131, otherwise a large amount of log information will be generated and the system efficiency will be reduced.
+
+## 1.What should I pay attention to when upgrading TDengine from older versions to 2.0 and above? ☆☆☆
+
+Version 2.0 is a complete refactoring of the previous version, and the configuration and data files are incompatible. Be sure to do the following before upgrading:
+
+1. Delete the configuration file, execute sudo rm `-rf /etc/taos/taos.cfg`
+2. Delete the log file, execute `sudo rm -rf /var/log/taos/`
+3. By ensuring that the data is no longer needed, delete the data file and execute `sudo rm -rf /var/lib/taos/`
+4. Install the latest stable version of TDengine
+5. If you need to migrate data or the data file is corrupted, please contact the official technical support team of TAOS Data to assist
+
+## 2. When encoutered with the error " Unable to establish connection " in Windows, what can I do?
+
+See the [technical blog](https://www.taosdata.com/blog/2019/12/03/jdbcdriver%E6%89%BE%E4%B8%8D%E5%88%B0%E5%8A%A8%E6%80%81%E9%93%BE%E6%8E%A5%E5%BA%93/) for this issue.
+
+## 3. Why I get “more dnodes are needed” when create a table?
+
+See the [technical blog](https://www.taosdata.com/blog/2019/12/03/%E5%88%9B%E5%BB%BA%E6%95%B0%E6%8D%AE%E8%A1%A8%E6%97%B6%E6%8F%90%E7%A4%BAmore-dnodes-are-needed/) for this issue.
+
+## 4. How do I generate a core file when TDengine crashes?
+
+See the [technical blog](https://www.taosdata.com/blog/2019/12/06/tdengine-crash%E6%97%B6%E7%94%9F%E6%88%90core%E6%96%87%E4%BB%B6%E7%9A%84%E6%96%B9%E6%B3%95/) for this issue.
+
+## 5. What should I do if I encounter an error "Unable to establish connection"?
+
+When the client encountered a connection failure, please follow the following steps to check:
+
+1. Check your network environment
+
+2. - Cloud server: Check whether the security group of the cloud server opens access to TCP/UDP ports 6030-6042
+   - Local virtual machine: Check whether the network can be pinged, and try to avoid using localhost as hostname
+   - Corporate server: If you are in a NAT network environment, be sure to check whether the server can return messages to the client
+
+2. Make sure that the client and server version numbers are exactly the same, and the open source Community Edition and Enterprise Edition cannot be mixed.
+3. On the server, execute systemctl status taosd to check the running status of *taosd*. If not running, start *taosd*.
+4. Verify that the correct server FQDN (Fully Qualified Domain Name, which is available by executing the Linux command hostname-f on the server) is specified when the client connects. FQDN configuration reference: "[All about FQDN of TDengine](https://www.taosdata.com/blog/2020/09/11/1824.html)".
+5. Ping the server FQDN. If there is no response, please check your network, DNS settings, or the system hosts file of the computer where the client is located.
+6. Check the firewall settings (Ubuntu uses ufw status, CentOS uses firewall-cmd-list-port) to confirm that TCP/UDP ports 6030-6042 are open.
+7. For JDBC (ODBC, Python, Go and other interfaces are similar) connections on Linux, make sure that libtaos.so is in the directory /usr/local/taos/driver, and /usr/local/taos/driver is in the system library function search path LD_LIBRARY_PATH.
+8. For JDBC, ODBC, Python, Go, etc. connections on Windows, make sure that C:\ TDengine\ driver\ taos.dll is in your system library function search directory (it is recommended that taos.dll be placed in the directory C:\ Windows\ System32)
+9. If the connection issue still exist
+
+1. - On Linux system, please use the command line tool nc to determine whether the TCP and UDP connections on the specified ports are unobstructed. Check whether the UDP port connection works: nc -vuz {hostIP} {port} Check whether the server-side TCP port connection works: nc -l {port}Check whether the client-side TCP port connection works: nc {hostIP} {port}
+   - Windows systems use the PowerShell command Net-TestConnection-ComputerName {fqdn} Port {port} to detect whether the service-segment port is accessed
+
+10. You can also use the built-in network connectivity detection function of taos program to verify whether the specified port connection between the server and the client is unobstructed (including TCP and UDP): [TDengine's Built-in Network Detection Tool Use Guide](https://www.taosdata.com/blog/2020/09/08/1816.html).
+
+
+
+## 6.What to do if I encounter an error "Unexpected generic error in RPC" or "TDengine error: Unable to resolve FQDN"?
+
+This error occurs because the client or data node cannot parse the FQDN (Fully Qualified Domain Name). For TAOS shell or client applications, check the following:
+
+1. Please verify whether the FQDN of the connected server is correct. FQDN configuration reference: "[All about FQDN of TDengine](https://www.taosdata.com/blog/2020/09/11/1824.html)".
+2. If the network is configured with a DNS server, check that it is working properly.
+3. If the network does not have a DNS server configured, check the hosts file of the machine where the client is located to see if the FQDN is configured and has the correct IP address.
+4. If the network configuration is OK, from the machine where the client is located, you need to be able to ping the connected FQDN, otherwise the client cannot connect to the server
+
+## 7.Although the syntax is corrected, why do I still get the “Invalid SQL" error?
+
+If you confirm that the syntax is correct, for versions older than 2.0, please check whether the SQL statement length exceeds 64K. If it does, this error will also be returned.
+
+## 8. Are “validation queries” supported?
+
+The TDengine does not yet have a dedicated set of validation queries. However, it is recommended to use the database "log" monitored by the system.
+
+## 9. Can I delete or update a record?
+
+TDengine does not support the deletion function at present, and may support it in the future according to user requirements.
+
+Starting from 2.0. 8.0, TDengine supports the function of updating written data. Using the update function requires using UPDATE 1 parameter when creating the database, and then you can use INSERT INTO command to update the same timestamp data that has been written. UPDATE parameter does not support ALTER DATABASE command modification. Without a database created using UPDATE 1 parameter, writing data with the same timestamp will not modify the previous data with no error reported.
+
+It should also be noted that when UPDATE is set to 0, the data with the same timestamp sent later will be discarded directly, but no error will be reported, and will still be included in affected rows (so the return information of INSERT instruction cannot be used for timestamp duplicate checking). The main reason for this design is that TDengine regards the written data as a stream. Regardless of whether the timestamp conflicts or not, TDengine believes that the original device that generates the data actually generates such data. The UPDATE parameter only controls how such stream data should be processed when persistence-when UPDATE is 0, it means that the data written first overwrites the data written later; When UPDATE is 1, it means that the data written later overwrites the data written first. How to choose this coverage relationship depends on whether the data generated first or later is expected in the subsequent use and statistics compile.
+
+## 10. How to create a table with more than 1024 columns?
+
+Using version 2.0 and above, 1024 columns are supported by default; for older versions, TDengine allowed the creation of a table with a maximum of 250 columns. However, if the limit is exceeded, it is recommended to logically split this wide table into several small ones according to the data characteristics.
+
+## 11. What is the most effective way to write data?
+
+Insert in batches. Each write statement can insert multiple records into one or multiple tables at the same time.
+
+## 12. What is the most effective way to write data? How to solve the problem that Chinese characters in nchar inserted under Windows systems are parsed into messy code?
+
+If there are Chinese characters in nchar data under Windows, please first confirm that the region of the system is set to China (which can be set in the Control Panel), then the taos client in cmd should already support it normally; If you are developing Java applications in an IDE, such as Eclipse and Intellij, please confirm that the file code in the IDE is GBK (this is the default coding type of Java), and then initialize the configuration of the client when generating the Connection. The specific statement is as follows:
+
+```JAVA
+Class.forName("com.taosdata.jdbc.TSDBDriver");
+Properties properties = new Properties();
+properties.setProperty(TSDBDriver.LOCALE_KEY, "UTF-8");
+Connection = DriverManager.getConnection(url, properties);
+```
+
+## 13. JDBC error: the excluded SQL is not a DML or a DDL?
+
+Please update to the latest JDBC driver.
+
+```xml
+<dependency>
+  <groupId>com.taosdata.jdbc</groupId>
+  <artifactId>taos-jdbcdriver</artifactId>
+  <version>2.0.27</version>
+</dependency>
+```
+
+## 14. taos connect failed, reason: invalid timestamp.
+
+The common reason is that the server time and client time are not calibrated, which can be calibrated by synchronizing with the time server (use ntpdate command under Linux, and select automatic synchronization in the Windows time setting).
+
+## 15. Incomplete display of table name
+
+Due to the limited display width of taos shell in the terminal, it is possible that a relatively long table name is not displayed completely. If relevant operations are carried out according to the displayed incomplete table name, a Table does not exist error will occur. The workaround can be by modifying the setting option maxBinaryDisplayWidth in the taos.cfg file, or directly entering the command `set max_binary_display_width 100`. Or, use the \\G parameter at the end of the command to adjust how the results are displayed.
+
+## 16. How to migrate data?
+
+TDengine uniquely identifies a machine according to hostname. When moving data files from machine A to machine B, pay attention to the following three points:
+
+- For versions 2.0. 0.0 to 2.0. 6. x, reconfigure machine B's hostname to machine A's.
+- For 2.0. 7.0 and later versions, go to/var/lib/taos/dnode, repair the FQDN corresponding to dnodeId of dnodeEps.json, and restart. Make sure this file is identical for all machines.
+- The storage structures of versions 1. x and 2. x are incompatible, and it is necessary to use migration tools or your own application to export and import data.
+
+## 17. How to temporarily adjust the log level in command line program taos?
+
+For the convenience of debugging, since version 2.0. 16, command line program taos gets two new instructions related to logging:
+
+```mysql
+ALTER LOCAL flag_name flag_value;
+```
+
+This means that under the current command line program, modify the loglevel of a specific module (only valid for the current command line program, if taos is restarted, it needs to be reset):
+
+- The values of flag_name can be: debugFlag, cDebugFlag, tmrDebugFlag, uDebugFlag, rpcDebugFlag
+- Flag_value values can be: 131 (output error and alarm logs), 135 (output error, alarm, and debug logs), 143 (output error, alarm, debug, and trace logs)
+
+```mysql
+ALTER LOCAL RESETLOG;
+```
+
+This means wiping up all client-generated log files on the machine.
+
diff --git a/documentation20/en/images/architecture/dnode.png b/documentation20/en/images/architecture/dnode.png
new file mode 100644
index 0000000000000000000000000000000000000000..cea87dcccba5d2761996e5dde998022d86487eb9
Binary files /dev/null and b/documentation20/en/images/architecture/dnode.png differ
diff --git a/documentation20/webdocs/assets/Picture2.png b/documentation20/en/images/architecture/message.png
similarity index 100%
rename from documentation20/webdocs/assets/Picture2.png
rename to documentation20/en/images/architecture/message.png
diff --git a/documentation20/en/images/architecture/modules.png b/documentation20/en/images/architecture/modules.png
new file mode 100644
index 0000000000000000000000000000000000000000..10ae4703a6cbbf66afea325ce4c0f919f7769a07
Binary files /dev/null and b/documentation20/en/images/architecture/modules.png differ
diff --git a/documentation20/webdocs/assets/stable.png b/documentation20/en/images/architecture/multi_tables.png
similarity index 100%
rename from documentation20/webdocs/assets/stable.png
rename to documentation20/en/images/architecture/multi_tables.png
diff --git a/documentation20/en/images/architecture/replica-forward.png b/documentation20/en/images/architecture/replica-forward.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf616e030b130603eceb5dccfd30b4a1dfa68ea5
Binary files /dev/null and b/documentation20/en/images/architecture/replica-forward.png differ
diff --git a/documentation20/en/images/architecture/replica-master.png b/documentation20/en/images/architecture/replica-master.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb33f1ce98661563693215d8fc73b003235c7668
Binary files /dev/null and b/documentation20/en/images/architecture/replica-master.png differ
diff --git a/documentation20/en/images/architecture/replica-restore.png b/documentation20/en/images/architecture/replica-restore.png
new file mode 100644
index 0000000000000000000000000000000000000000..1558e5ed0108d23efdc6b5d9ea0e44a1dff45d28
Binary files /dev/null and b/documentation20/en/images/architecture/replica-restore.png differ
diff --git a/documentation20/webdocs/assets/structure.png b/documentation20/en/images/architecture/structure.png
similarity index 100%
rename from documentation20/webdocs/assets/structure.png
rename to documentation20/en/images/architecture/structure.png
diff --git a/documentation20/en/images/architecture/vnode.png b/documentation20/en/images/architecture/vnode.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6148d4907cf9a18bc52251f712d5c685651b7f5
Binary files /dev/null and b/documentation20/en/images/architecture/vnode.png differ
diff --git a/documentation20/en/images/architecture/write_master.png b/documentation20/en/images/architecture/write_master.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff2dfc20bfc2ecf956a2aab1a8965a7bbcae4387
Binary files /dev/null and b/documentation20/en/images/architecture/write_master.png differ
diff --git a/documentation20/en/images/architecture/write_slave.png b/documentation20/en/images/architecture/write_slave.png
new file mode 100644
index 0000000000000000000000000000000000000000..cacb2cb6bcc4f4d934e979862387e1345bbac078
Binary files /dev/null and b/documentation20/en/images/architecture/write_slave.png differ
diff --git a/documentation20/en/images/connections/add_datasource1.jpg b/documentation20/en/images/connections/add_datasource1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1f0f5110f312c57f3ec1788bbc02f04fac6ac142
Binary files /dev/null and b/documentation20/en/images/connections/add_datasource1.jpg differ
diff --git a/documentation20/en/images/connections/add_datasource2.jpg b/documentation20/en/images/connections/add_datasource2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..fa7a83e00e96fae649910dff4edf5f5bdadd7850
Binary files /dev/null and b/documentation20/en/images/connections/add_datasource2.jpg differ
diff --git a/documentation20/en/images/connections/add_datasource3.jpg b/documentation20/en/images/connections/add_datasource3.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..fc850ad08ff1174de972906842e0d5ee64e6e5cb
Binary files /dev/null and b/documentation20/en/images/connections/add_datasource3.jpg differ
diff --git a/documentation20/en/images/connections/add_datasource4.jpg b/documentation20/en/images/connections/add_datasource4.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3ba73e50d455111f8621f4165746078554c2d790
Binary files /dev/null and b/documentation20/en/images/connections/add_datasource4.jpg differ
diff --git a/documentation20/en/images/connections/create_dashboard1.jpg b/documentation20/en/images/connections/create_dashboard1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3b83c3a1714e9e7540e0b06239ef7c1c4f63fe2c
Binary files /dev/null and b/documentation20/en/images/connections/create_dashboard1.jpg differ
diff --git a/documentation20/en/images/connections/create_dashboard2.jpg b/documentation20/en/images/connections/create_dashboard2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..fe5d768ac55254251e0290bf257178f5ff28f5a5
Binary files /dev/null and b/documentation20/en/images/connections/create_dashboard2.jpg differ
diff --git a/documentation20/en/images/connections/import_dashboard1.jpg b/documentation20/en/images/connections/import_dashboard1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..9d2ce7ed65eb0c2c729de50283b30491793493dc
Binary files /dev/null and b/documentation20/en/images/connections/import_dashboard1.jpg differ
diff --git a/documentation20/en/images/connections/import_dashboard2.jpg b/documentation20/en/images/connections/import_dashboard2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..94b09f0ee39552bb84f7ba1f65815ce2c9548b2d
Binary files /dev/null and b/documentation20/en/images/connections/import_dashboard2.jpg differ
diff --git a/documentation20/en/images/connector.png b/documentation20/en/images/connector.png
new file mode 100644
index 0000000000000000000000000000000000000000..6030bd73f51123615eabacfa5d734918559ce3d9
Binary files /dev/null and b/documentation20/en/images/connector.png differ
diff --git a/documentation20/en/images/eco_system.png b/documentation20/en/images/eco_system.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf8bf8f1e0a2311fc12202d712a8a2f9b8ce419b
Binary files /dev/null and b/documentation20/en/images/eco_system.png differ
diff --git a/documentation20/en/images/tdengine-jdbc-connector.png b/documentation20/en/images/tdengine-jdbc-connector.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdf1dd3fcc5ee222c4a8753efa2c95c5257314bf
Binary files /dev/null and b/documentation20/en/images/tdengine-jdbc-connector.png differ
diff --git a/documentation20/webdocs/assets/clip_image001-2474914.png b/documentation20/webdocs/assets/clip_image001-2474914.png
deleted file mode 100644
index eb369b1567c860b772e1bfdad64ff17aaac2534d..0000000000000000000000000000000000000000
Binary files a/documentation20/webdocs/assets/clip_image001-2474914.png and /dev/null differ
diff --git a/documentation20/webdocs/assets/clip_image001-2474939.png b/documentation20/webdocs/assets/clip_image001-2474939.png
deleted file mode 100644
index 53f00deea3a484986a5681ec9d00d8ae02e88fec..0000000000000000000000000000000000000000
Binary files a/documentation20/webdocs/assets/clip_image001-2474939.png and /dev/null differ
diff --git a/documentation20/webdocs/assets/clip_image001-2474961.png b/documentation20/webdocs/assets/clip_image001-2474961.png
deleted file mode 100644
index 20ae8d6f7724a4bddcf8c7eb3809d468aa4223ed..0000000000000000000000000000000000000000
Binary files a/documentation20/webdocs/assets/clip_image001-2474961.png and /dev/null differ
diff --git a/documentation20/webdocs/assets/clip_image001-2474987.png b/documentation20/webdocs/assets/clip_image001-2474987.png
deleted file mode 100644
index 3d09f7fc28e7a1fb7e3bb2b9b2bc7c20895e8bb4..0000000000000000000000000000000000000000
Binary files a/documentation20/webdocs/assets/clip_image001-2474987.png and /dev/null differ
diff --git a/documentation20/webdocs/assets/clip_image001.png b/documentation20/webdocs/assets/clip_image001.png
deleted file mode 100644
index 78b6d06a9562b802e80f0ed5fdb8963b5e525589..0000000000000000000000000000000000000000
Binary files a/documentation20/webdocs/assets/clip_image001.png and /dev/null differ
diff --git a/documentation20/webdocs/assets/fig1.png b/documentation20/webdocs/assets/fig1.png
deleted file mode 100644
index af9b74e0d1a872b8d93f71842dc0063bc8a86092..0000000000000000000000000000000000000000
Binary files a/documentation20/webdocs/assets/fig1.png and /dev/null differ
diff --git a/documentation20/webdocs/assets/fig2.png b/documentation20/webdocs/assets/fig2.png
deleted file mode 100644
index 3bae70ba86964c3c341b72ea1d3af04201f7c6c1..0000000000000000000000000000000000000000
Binary files a/documentation20/webdocs/assets/fig2.png and /dev/null differ
diff --git a/documentation20/webdocs/assets/image-20190707124650780.png b/documentation20/webdocs/assets/image-20190707124650780.png
deleted file mode 100644
index 9ebcac863e862d8b240c86dec29be1ebe7aa50f0..0000000000000000000000000000000000000000
Binary files a/documentation20/webdocs/assets/image-20190707124650780.png and /dev/null differ
diff --git a/documentation20/webdocs/assets/image-20190707124818590.png b/documentation20/webdocs/assets/image-20190707124818590.png
deleted file mode 100644
index dc1cb6325b2d4cd6f05c88b75b4d17ef85caa67f..0000000000000000000000000000000000000000
Binary files a/documentation20/webdocs/assets/image-20190707124818590.png and /dev/null differ
diff --git a/documentation20/webdocs/markdowndocs/Connections with other Tools.md b/documentation20/webdocs/markdowndocs/Connections with other Tools.md
deleted file mode 100644
index 8be05698497184aee2c41a60e32f39b636e2070e..0000000000000000000000000000000000000000
--- a/documentation20/webdocs/markdowndocs/Connections with other Tools.md	
+++ /dev/null
@@ -1,167 +0,0 @@
-# Connect with other tools
-
-## Telegraf
-
-TDengine is easy to integrate with [Telegraf](https://www.influxdata.com/time-series-platform/telegraf/), an open-source server agent for collecting and sending metrics and events, without more development.
-
-### Install Telegraf
-
-At present, TDengine supports Telegraf newer than version 1.7.4. Users can go to the [download link] and choose the proper package to install on your system.
-
-### Configure Telegraf
-
-Telegraf is configured by changing items in the configuration file */etc/telegraf/telegraf.conf*.
-
-
-In **output plugins** section，add _[[outputs.http]]_ iterm： 
-
-- _url_: http://ip:6020/telegraf/udb, in which _ip_ is the IP address of any node in TDengine cluster. Port 6020 is the RESTful APT port used by TDengine. _udb_ is the name of the database to save data, which needs to create beforehand.
-- _method_: "POST" 
-- _username_: username to login TDengine
-- _password_: password to login TDengine 
-- _data_format_: "json"
-- _json_timestamp_units_: "1ms"
-
-In **agent** part：
-
-- hostname: used to distinguish different machines. Need to be unique.
-- metric_batch_size: 30，the maximum number of records allowed to write in Telegraf. The larger the value is, the less frequent requests are sent. For TDengine, the value should be less than 50.
-
-Please refer to the [Telegraf docs](https://docs.influxdata.com/telegraf/v1.11/) for more information.
-
-## Grafana
-
-[Grafana] is an open-source system for time-series data display. It is easy to integrate TDengine and Grafana to build a monitor system. Data saved in TDengine can be fetched and shown on the Grafana dashboard.
-
-### Install Grafana
-
-For now, TDengine only supports Grafana newer than version 5.2.4. Users can go to the [Grafana download page] for the proper package to download.
-
-### Configure Grafana
-
-TDengine Grafana plugin is in the _/usr/local/taos/connector/grafana_ directory.
-Taking Centos 7.2 as an example, just copy TDengine directory to _/var/lib/grafana/plugins_ directory and restart Grafana.
-
-### Use Grafana
-
-Users can log in the Grafana server (username/password:admin/admin) through localhost:3000 to configure TDengine as the data source. As is shown in the picture below, TDengine as a data source option is shown in the box:
-
-
-![img](../assets/clip_image001.png)
-
-When choosing TDengine as the data source, the Host in HTTP configuration should be configured as the IP address of any node of a TDengine cluster. The port should be set as 6020. For example, when TDengine and Grafana are on the same machine, it should be configured as _http://localhost:6020. 
-
-
-Besides, users also should set the username and password used to log into TDengine. Then click _Save&Test_ button to save.
-
-![img](../assets/clip_image001-2474914.png)
-
-Then, TDengine as a data source should show in the Grafana data source list.
-
-![img](../assets/clip_image001-2474939.png)
-
-
-Then, users can create Dashboards in Grafana using TDengine as the data source:
-
-
-![img](../assets/clip_image001-2474961.png)
-
- 
-
-Click _Add Query_ button to add a query and input the SQL command you want to run in the _INPUT SQL_ text box. The SQL command should expect a two-row, multi-column result, such as _SELECT count(*) FROM sys.cpu WHERE ts>=from and ts<​to interval(interval)_, in which, _from_, _to_ and _inteval_ are TDengine inner variables representing query time range and time interval.
-
-
-_ALIAS BY_ field is to set the query alias. Click _GENERATE SQL_ to send the command to TDengine:
-
-![img](../assets/clip_image001-2474987.png)
-
-Please refer to the [Grafana official document] for more information about Grafana.
-
-
-## Matlab
-
-Matlab can connect to and retrieve data from TDengine by TDengine JDBC Driver.
-
-### MatLab and TDengine JDBC adaptation
-
-Several steps are required to adapt Matlab to TDengine. Taking adapting Matlab2017a on Windows10 as an example:
-
-1. Copy the file _JDBCDriver-1.0.0-dist.jar_ in TDengine package to the directory _${matlab_root}\MATLAB\R2017a\java\jar\toolbox_
-2. Copy the file _taos.lib_ in TDengine package to _${matlab_ root _dir}\MATLAB\R2017a\lib\win64_
-3. Add the .jar package just copied to the Matlab classpath. Append the line below as the end of the file of _${matlab_ root _dir}\MATLAB\R2017a\toolbox\local\classpath.txt_
-
-​          `$matlabroot/java/jar/toolbox/JDBCDriver-1.0.0-dist.jar`
-
-4. Create a file called _javalibrarypath.txt_ in directory _${user_home}\AppData\Roaming\MathWorks\MATLAB\R2017a\_, and add the _taos.dll_ path in the file. For example, if the file _taos.dll_ is in the directory of _C:\Windows\System32_，then add the following line in file *javalibrarypath.txt*:
-
-​          `C:\Windows\System32`
-
-### TDengine operations in Matlab
-
-After correct configuration, open Matlab:
-
-- build a connection：
-
-  `conn = database(‘db’, ‘root’, ‘taosdata’, ‘com.taosdata.jdbc.TSDBDriver’, ‘jdbc:TSDB://127.0.0.1:0/’)`
-
-- Query：
-
-  `sql0 = [‘select * from tb’]`
-
-  `data = select(conn, sql0);`
-
-- Insert a record:
-
-  `sql1 = [‘insert into tb values (now, 1)’]`
-
-  `exec(conn, sql1)`
-
-Please refer to the file _examples\Matlab\TDengineDemo.m_ for more information.
-
-## R 
-
-Users can use R language to access the TDengine server with the JDBC interface. At first, install JDBC package in R:
-
-```R
-install.packages('rJDBC', repos='http://cran.us.r-project.org')
-```
-
-Then use _library_ function to load the package:
-
-```R
-library('RJDBC')
-```
-
-Then load the TDengine JDBC driver:
-
-```R
-drv<-JDBC("com.taosdata.jdbc.TSDBDriver","JDBCDriver-1.0.0-dist.jar", identifier.quote="\"")
-```
-If succeed, no error message will display. Then use the following command to try a database connection:
-
-```R
-conn<-dbConnect(drv,"jdbc:TSDB://192.168.0.1:0/?user=root&password=taosdata","root","taosdata")
-```
-
-Please replace the IP address in the command above to the correct one. If no error message is shown, then the connection is established successfully. TDengine supports below functions in _RJDBC_ package:
-
-
--	_dbWriteTable(conn, "test", iris, overwrite=FALSE, append=TRUE)_: write the data in a data frame _iris_ to the table _test_ in the TDengine server. Parameter _overwrite_ must be _false_. _append_ must be _TRUE_ and the schema of the data frame _iris_ should be the same as the table _test_.
--	_dbGetQuery(conn, "select count(*) from test")_: run a query command
--	_dbSendUpdate(conn, "use db")_: run any non-query command.
--	_dbReadTable(conn, "test"_): read all the data in table _test_
--	_dbDisconnect(conn)_: close a connection
--	_dbRemoveTable(conn, "test")_: remove table _test_
-
-Below functions are **not supported** currently:
-- _dbExistsTable(conn, "test")_: if talbe _test_ exists
-- _dbListTables(conn)_: list all tables in the connection
-
-
-[Telegraf]: www.taosdata.com
-[download link]: https://portal.influxdata.com/downloads
-[Telegraf document]: www.taosdata.com
-[Grafana]: https://grafana.com
-[Grafana download page]: https://grafana.com/grafana/download
-[Grafana official document]: https://grafana.com/docs/
-
diff --git a/documentation20/webdocs/markdowndocs/Connector.md b/documentation20/webdocs/markdowndocs/Connector.md
deleted file mode 100644
index e5ba6d518542fa60f71708482a9e9b65c12d09ad..0000000000000000000000000000000000000000
--- a/documentation20/webdocs/markdowndocs/Connector.md
+++ /dev/null
@@ -1,896 +0,0 @@
-# TDengine connectors
-
-TDengine provides many connectors for development, including C/C++, JAVA, Python, RESTful, Go, Node.JS, etc.
-
-NOTE: All APIs which require a SQL string as parameter, including but not limit to `taos_query`, `taos_query_a`, `taos_subscribe` in the C/C++ Connector and their counterparts in other connectors, can ONLY process one SQL statement at a time. If more than one SQL statements are provided, their behaviors are undefined.
-
-## C/C++ API
-
-C/C++ APIs are similar to the MySQL APIs. Applications should include TDengine head file _taos.h_ to use C/C++ APIs by adding the following line in code:
-```C
-#include <taos.h>
-```
-Make sure TDengine library _libtaos.so_ is installed and use _-ltaos_ option to link the library when compiling. In most cases, if the return value of an API is integer, it return _0_ for success and other values as an error code for failure; if the return value is pointer, then _NULL_ is used for failure.
-
-
-### Fundamental API
-
-Fundamentatal APIs prepare runtime environment for other APIs, for example, create a database connection.
-
-- `void taos_init()`
-
-  Initialize the runtime environment for TDengine client. The API is not necessary since it is called int _taos_connect_ by default.
-
-
-- `void taos_cleanup()`
-
-  Cleanup runtime environment, client should call this API before exit.
-
-
-- `int taos_options(TSDB_OPTION option, const void * arg, ...)`
-
-   Set client options. The parameter _option_ supports values of _TSDB_OPTION_CONFIGDIR_ (configuration directory), _TSDB_OPTION_SHELL_ACTIVITY_TIMER_, _TSDB_OPTION_LOCALE_ (client locale) and _TSDB_OPTION_TIMEZONE_ (client timezone).
-
-
-- `char* taos_get_client_info()`
-
-  Retrieve version information of client.
-
-
-- `TAOS *taos_connect(const char *ip, const char *user, const char *pass, const char *db, int port)`
-
-  Open a connection to a TDengine server. The parameters are:
-  
-  * ip: IP address of the server
-  * user: username
-  * pass: password
-  * db: database to use, **NULL** for no database to use after connection. Otherwise, the database should exist before connection or a connection error is reported.
-  * port: port number to connect
-
-  The handle returned by this API should be kept for future use.
-
-
-- `char *taos_get_server_info(TAOS *taos)`
-
-  Retrieve version information of server.
-
-
-- `int taos_select_db(TAOS *taos, const char *db)`
-
-  Set default database to `db`.
-
-
-- `void taos_close(TAOS *taos)`
-
-  Close a connection to a TDengine server by the handle returned by _taos_connect_`
-
-
-### C/C++ sync API
-
-Sync APIs are those APIs waiting for responses from the server after sending a request. TDengine has the following sync APIs:
-
-- `TAOS_RES* taos_query(TAOS *taos, const char *sql)`
-
-  The API used to run a SQL command. The command can be DQL, DML or DDL. The parameter _taos_ is the handle returned by _taos_connect_. Return value _NULL_ means failure.
-
-
-- `int taos_result_precision(TAOS_RES *res)`
-
-  Get the timestamp precision of the result set, return value _0_ means milli-second, _1_ mean micro-second and _2_ means nano-second.
-
-
-- `TAOS_ROW taos_fetch_row(TAOS_RES *res)`
-
-  Fetch a row of return results through _res_.
-
-
-- `int taos_fetch_block(TAOS_RES *res, TAOS_ROW *rows)`
-
-  Fetch multiple rows from the result set, return value is row count.
-
-
-- `int taos_num_fields(TAOS_RES *res)` and `int taos_field_count(TAOS_RES* res)`
-
-  These two APIs are identical, both return the number of fields in the return result.
-
-
-- `int* taos_fetch_lengths(TAOS_RES *res)`
-
-  Get the field lengths of the result set, return value is an array whose length is the field count.
-
-
-- `int taos_affected_rows(TAOS_RES *res)`
-
-  Get affected row count of the executed statement.
-
-
-- `TAOS_FIELD *taos_fetch_fields(TAOS_RES *res)`
-
-  Fetch the description of each field. The description includes the property of data type, field name, and bytes. The API should be used with _taos_num_fields_ to fetch a row of data. The structure of `TAOS_FIELD` is:
-
-  ```c
-  typedef struct taosField {
-    char     name[65];  // field name
-    uint8_t  type;      // data type
-    int16_t  bytes;     // length of the field in bytes
-  } TAOS_FIELD;
-  ```
-
-
-- `void taos_stop_query(TAOS_RES *res)`
-
-  Stop the execution of a query.
-
-
-- `void taos_free_result(TAOS_RES *res)`
-
-  Free the resources used by a result set. Make sure to call this API after fetching results or memory leak would happen.
-
-
-- `char *taos_errstr(TAOS_RES *res)`
-
-  Return the reason of the last API call failure. The return value is a string.
-
-
-- `int *taos_errno(TAOS_RES *res)`
-
-  Return the error code of the last API call failure. The return value is an integer.
-
-
-**Note**: The connection to a TDengine server is not multi-thread safe. So a connection can only be used by one thread.
-
-
-### C/C++ async API
-
-In addition to sync APIs, TDengine also provides async APIs, which are more efficient. Async APIs are returned right away without waiting for a response from the server, allowing the application to continute with other tasks without blocking. So async APIs are more efficient, especially useful when in a poor network.
-
-All async APIs require callback functions. The callback functions have the format:
-```C
-void fp(void *param, TAOS_RES * res, TYPE param3)
-```
-The first two parameters of the callback function are the same for all async APIs. The third parameter is different for different APIs. Generally, the first parameter is the handle provided to the API for action. The second parameter is a result handle.
-
-- `void taos_query_a(TAOS *taos, const char *sql, void (*fp)(void *param, TAOS_RES *, int code), void *param);`
-
-  The async version of _taos_query_.
-  
-  * taos: the handle returned by _taos_connect_.
-  * sql: the SQL command to run.
-  * fp: user defined callback function. The third parameter of the callback function _code_ is _0_ (for success) or a negative number (for failure, call taos_errstr to get the error as a string).  Applications mainly handle the second parameter, the returned result set.
-  * param: user provided parameter which is required by the callback function. 
-
-
-- `void taos_fetch_rows_a(TAOS_RES *res, void (*fp)(void *param, TAOS_RES *, int numOfRows), void *param);`
-
-  The async API to fetch a batch of rows, which should only be used with a _taos_query_a_ call.
-  
-  * res: result handle returned by _taos_query_a_.
-  * fp: the callback function. _param_ is a user-defined structure to pass to _fp_. The parameter _numOfRows_ is the number of result rows in the current fetch cycle. In the callback function, applications should call _taos_fetch_row_ to get records from the result handle. After getting a batch of results, applications should continue to call _taos_fetch_rows_a_ API to handle the next batch, until the _numOfRows_ is _0_ (for no more data to fetch) or _-1_ (for failure).
-
-
-- `void taos_fetch_row_a(TAOS_RES *res, void (*fp)(void *param, TAOS_RES *, TAOS_ROW row), void *param);`
-
-  The async API to fetch a result row.
-
-  * res: result handle.
-  * fp: the callback function. _param_ is a user-defined structure to pass to _fp_. The third parameter of the callback function is a single result row, which is different from that of _taos_fetch_rows_a_ API. With this API, it is not necessary to call _taos_fetch_row_ to retrieve each result row, which is handier than _taos_fetch_rows_a_ but less efficient.
-
-
-Applications may apply operations on multiple tables. However, **it is important to make sure the operations on the same table are serialized**. That means after sending an insert request in a table to the server, no operations on the table are allowed before a response is received.
-
-
-### C/C++ parameter binding API
-
-TDengine also provides parameter binding APIs, like MySQL, only question mark `?` can be used to represent a parameter in these APIs.
-
-- `TAOS_STMT* taos_stmt_init(TAOS *taos)`
-
-  Create a TAOS_STMT to represent the prepared statement for other APIs.
-
-- `int taos_stmt_prepare(TAOS_STMT *stmt, const char *sql, unsigned long length)`
-
-  Parse SQL statement _sql_ and bind result to _stmt_ , if _length_ larger than 0, its value is used to determine the length of _sql_, the API auto detects the actual length of _sql_ otherwise.
-
-- `int taos_stmt_bind_param(TAOS_STMT *stmt, TAOS_BIND *bind)`
-
-  Bind values to parameters. _bind_ points to an array, the element count and sequence of the array must be identical as the parameters of the SQL statement. The usage of _TAOS_BIND_ is same as _MYSQL_BIND_ in MySQL, its definition is as below:
-
-  ```c
-  typedef struct TAOS_BIND {
-    int            buffer_type;
-    void *         buffer;
-    unsigned long  buffer_length;  // not used in TDengine
-    unsigned long *length;
-    int *          is_null;
-    int            is_unsigned;    // not used in TDengine
-    int *          error;          // not used in TDengine
-  } TAOS_BIND;
-  ```
-
-- `int taos_stmt_add_batch(TAOS_STMT *stmt)`
-
-  Add bound parameters to batch, client can call `taos_stmt_bind_param` again after calling this API. Note this API only support _insert_ / _import_ statements, it returns an error in other cases.
-
-- `int taos_stmt_execute(TAOS_STMT *stmt)`
-
-  Execute the prepared statement. This API can only be called once for a statement at present.
-
-- `TAOS_RES* taos_stmt_use_result(TAOS_STMT *stmt)`
-
-  Acquire the result set of an executed statement. The usage of the result is same as `taos_use_result`, `taos_free_result` must be called after one you are done with the result set to release resources.
-
-- `int taos_stmt_close(TAOS_STMT *stmt)`
-
-  Close the statement, release all resources.
-
-
-### C/C++ continuous query interface
-
-TDengine provides APIs for continuous query driven by time, which run queries periodically in the background. There are only two APIs:
-
-
-- `TAOS_STREAM *taos_open_stream(TAOS *taos, const char *sqlstr, void (*fp)(void *param, TAOS_RES * res, TAOS_ROW row), int64_t stime, void *param, void (*callback)(void *));`
-
-  The API is used to create a continuous query.
-  * _taos_: the connection handle returned by _taos_connect_.
-  * _sqlstr_: the SQL string to run. Only query commands are allowed.
-  * _fp_: the callback function to run after a query. TDengine passes query result `row`, query state `res` and user provided parameter `param` to this function. In this callback, `taos_num_fields` and `taos_fetch_fields` could be used to fetch field information.
-  * _param_: a parameter passed to _fp_
-  * _stime_: the time of the stream starts in the form of epoch milliseconds. If _0_ is given, the start time is set as the current time.
-  * _callback_: a callback function to run when the continuous query stops automatically.
-
-  The API is expected to return a handle for success. Otherwise, a NULL pointer is returned.
-
-
-- `void taos_close_stream (TAOS_STREAM *tstr)`
-
-  Close the continuous query by the handle returned by _taos_open_stream_. Make sure to call this API when the continuous query is not needed anymore.
-  
-
-### C/C++ subscription API
-
-For the time being, TDengine supports subscription on one or multiple tables. It is implemented through periodic pulling from a TDengine server. 
-
-* `TAOS_SUB *taos_subscribe(TAOS* taos, int restart, const char* topic, const char *sql, TAOS_SUBSCRIBE_CALLBACK fp, void *param, int interval)`
-
-  The API is used to start a subscription session, it returns the subscription object on success and `NULL` in case of failure, the parameters are:
-  * **taos**: The database connnection, which must be established already.
-  * **restart**: `Zero` to continue a subscription if it already exits, other value to start from the beginning.
-  * **topic**: The unique identifier of a subscription.
-  * **sql**: A sql statement for data query, it can only be a `select` statement, can only query for raw data, and can only query data in ascending order of the timestamp field.
-  * **fp**: A callback function to receive query result, only used in asynchronization mode and should be `NULL` in synchronization mode, please refer below for its prototype.
-  * **param**: User provided additional parameter for the callback function.
-  * **interval**: Pulling interval in millisecond. Under asynchronization mode, API will call the callback function `fp` in this interval, system performance will be impacted if this interval is too short. Under synchronization mode, if the duration between two call to `taos_consume` is less than this interval, the second call blocks until the duration exceed this interval.
-
-* `typedef void (*TAOS_SUBSCRIBE_CALLBACK)(TAOS_SUB* tsub, TAOS_RES *res, void* param, int code)`
-
-  Prototype of the callback function, the parameters are:
-  * tsub: The subscription object.
-  * res: The query result.
-  * param: User provided additional parameter when calling `taos_subscribe`.
-  * code: Error code in case of failures.
-
-* `TAOS_RES *taos_consume(TAOS_SUB *tsub)`
-
-  The API used to get the new data from a TDengine server. It should be put in an loop. The parameter `tsub` is the handle returned by `taos_subscribe`. This API should only be called in synchronization mode. If the duration between two call to `taos_consume` is less than pulling interval, the second call blocks until the duration exceed the interval. The API returns the new rows if new data arrives, or empty rowset otherwise, and if there's an error, it returns `NULL`.
-  
-* `void taos_unsubscribe(TAOS_SUB *tsub, int keepProgress)`
-
-  Stop a subscription session by the handle returned by `taos_subscribe`. If `keepProgress` is **not** zero, the subscription progress information is kept and can be reused in later call to `taos_subscribe`, the information is removed otherwise.
-
-
-##  Java Connector
-
-To Java delevopers, TDengine provides `taos-jdbcdriver` according to the JDBC(3.0) API. Users can find and download it through [Sonatype Repository][1].
-
-Since the native language of TDengine is C, the necessary TDengine library should be checked before using the taos-jdbcdriver:
-
-* libtaos.so (Linux)
-    After TDengine is installed successfully, the library `libtaos.so` will be automatically copied to the `/usr/lib/`, which is the system's default search path. 
-    
-* taos.dll (Windows)
-    After TDengine client is installed, the library `taos.dll` will be automatically copied to the `C:/Windows/System32`, which is the system's default search path. 
-    
-> Note: Please make sure that [TDengine Windows client][14] has been installed if developing on Windows. Now although TDengine client would be defaultly installed together with TDengine server, it can also be installed [alone][15].
-
-Since TDengine is time-series database, there are still some differences compared with traditional databases in using TDengine JDBC driver: 
-* TDengine doesn't allow to delete/modify a single record, and thus JDBC driver also has no such method. 
-* No support for transaction
-* No support for union between tables
-* No support for nested query，`There is at most one open ResultSet for each Connection. Thus, TSDB JDBC Driver will close current ResultSet if it is not closed and a new query begins`.
-
-## Version list of TAOS-JDBCDriver and required TDengine and JDK 
-
-| taos-jdbcdriver | TDengine  | JDK  | 
-| --- | --- | --- |
-| 2.0.2 | 2.0.0.x or higher | 1.8.x | 
-| 1.0.3 | 1.6.1.x or higher | 1.8.x |
-| 1.0.2 | 1.6.1.x or higher | 1.8.x |  
-| 1.0.1 | 1.6.1.x or higher | 1.8.x |
-
-## DataType in TDengine and Java
-
-The datatypes in TDengine include timestamp, number, string and boolean, which are converted as follows in Java:
-
-| TDengine | Java | 
-| --- | --- | 
-| TIMESTAMP | java.sql.Timestamp | 
-| INT | java.lang.Integer | 
-| BIGINT | java.lang.Long |  
-| FLOAT | java.lang.Float |  
-| DOUBLE | java.lang.Double | 
-| SMALLINT, TINYINT |java.lang.Short  |
-| BOOL | java.lang.Boolean | 
-| BINARY, NCHAR | java.lang.String | 
-
-## How to get TAOS-JDBC Driver
-
-### maven repository
-
-taos-jdbcdriver has been published to [Sonatype Repository][1]:
-* [sonatype][8]
-* [mvnrepository][9]
-* [maven.aliyun][10]
-
-Using the following pom.xml for maven projects
-
-```xml
-<dependencies>
-    <dependency>
-        <groupId>com.taosdata.jdbc</groupId>
-        <artifactId>taos-jdbcdriver</artifactId>
-        <version>2.0.2</version>
-    </dependency>
-</dependencies>
-```
-
-### JAR file from the source code
-
-After downloading the [TDengine][3] source code, execute `mvn clean package` in the directory `src/connector/jdbc` and then the corresponding jar file is generated.
-
-## Usage 
-
-### get the connection
-
-```java
-Class.forName("com.taosdata.jdbc.TSDBDriver");
-String jdbcUrl = "jdbc:TAOS://127.0.0.1:6030/log?user=root&password=taosdata";
-Connection conn = DriverManager.getConnection(jdbcUrl);
-```
-> `6030` is the default port and `log` is the default database for system monitor.
-
-A normal JDBC URL looks as follows:
-`jdbc:TAOS://{host_ip}:{port}/[database_name]?[user={user}|&password={password}|&charset={charset}|&cfgdir={config_dir}|&locale={locale}|&timezone={timezone}]`
-
-values in `{}` are necessary while values in `[]` are optional。Each option in the above URL denotes:
-
-* user：user name for login, defaultly root。
-* password：password for login，defaultly taosdata。
-* charset：charset for client，defaultly system charset
-* cfgdir：log directory for client, defaultly _/etc/taos/_ on Linux and _C:/TDengine/cfg_ on Windows。
-* locale：language for client，defaultly system locale。
-* timezone：timezone for client，defaultly system timezone。
-
-The options above can be configures (`ordered by priority`):
-1. JDBC URL 
-
-    As explained above.
-2. java.sql.DriverManager.getConnection(String jdbcUrl, Properties connProps)
-```java
-public Connection getConn() throws Exception{
-  Class.forName("com.taosdata.jdbc.TSDBDriver");
-  String jdbcUrl = "jdbc:TAOS://127.0.0.1:0/log?user=root&password=taosdata";
-  Properties connProps = new Properties();
-  connProps.setProperty(TSDBDriver.PROPERTY_KEY_USER, "root");
-  connProps.setProperty(TSDBDriver.PROPERTY_KEY_PASSWORD, "taosdata");
-  connProps.setProperty(TSDBDriver.PROPERTY_KEY_CONFIG_DIR, "/etc/taos");
-  connProps.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
-  connProps.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
-  connProps.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-  Connection conn = DriverManager.getConnection(jdbcUrl, connProps);
-  return conn;
-}
-```
-
-3. Configuration file (taos.cfg)
-
-    Default configuration file is _/var/lib/taos/taos.cfg_ On Linux and _C:\TDengine\cfg\taos.cfg_ on Windows
-```properties
-# client default username
-# defaultUser           root
-
-# client default password
-# defaultPass           taosdata
-
-# default system charset
-# charset               UTF-8
-
-# system locale
-# locale                en_US.UTF-8
-```
-> More options can refer to [client configuration][13]
-
-### Create databases and tables
-
-```java
-Statement stmt = conn.createStatement();
-
-// create database
-stmt.executeUpdate("create database if not exists db");
-
-// use database
-stmt.executeUpdate("use db");
-
-// create table
-stmt.executeUpdate("create table if not exists tb (ts timestamp, temperature int, humidity float)");
-```
-> Note: if no step like `use db`, the name of database must be added as prefix like _db.tb_ when operating on tables 
-
-### Insert data
-
-```java
-// insert data
-int affectedRows = stmt.executeUpdate("insert into tb values(now, 23, 10.3) (now + 1s, 20, 9.3)");
-
-System.out.println("insert " + affectedRows + " rows.");
-```
-> _now_ is the server time.
-> _now+1s_ is 1 second later than current server time. The time unit includes: _a_(millisecond), _s_(second), _m_(minute), _h_(hour), _d_(day), _w_(week), _n_(month), _y_(year).
-
-### Query database
-
-```java
-// query data
-ResultSet resultSet = stmt.executeQuery("select * from tb");
-
-Timestamp ts = null;
-int temperature = 0;
-float humidity = 0;
-while(resultSet.next()){
-
-    ts = resultSet.getTimestamp(1);
-    temperature = resultSet.getInt(2);
-    humidity = resultSet.getFloat("humidity");
-
-    System.out.printf("%s, %d, %s\n", ts, temperature, humidity);
-}
-```
-> query is consistent with relational database. The subscript start with 1 when retrieving return results. It is recommended to use the column name to retrieve results.
-
-### Close all
-
-```java
-resultSet.close();
-stmt.close();
-conn.close();
-```
-> `please make sure the connection is closed to avoid the error like connection leakage`
-
-## Using connection pool
-
-**HikariCP**
-
-* dependence in pom.xml：
-```xml
-<dependency>
-    <groupId>com.zaxxer</groupId>
-    <artifactId>HikariCP</artifactId>
-    <version>3.4.1</version>
-</dependency>
-```
-
-* Examples：
-```java
- public static void main(String[] args) throws SQLException {
-    HikariConfig config = new HikariConfig();
-    config.setJdbcUrl("jdbc:TAOS://127.0.0.1:6030/log");
-    config.setUsername("root");
-    config.setPassword("taosdata");
-
-    config.setMinimumIdle(3);           //minimum number of idle connection
-    config.setMaximumPoolSize(10);      //maximum number of connection in the pool
-    config.setConnectionTimeout(10000); //maximum wait milliseconds for get connection from pool
-    config.setIdleTimeout(60000);       // max idle time for recycle idle connection 
-    config.setConnectionTestQuery("describe log.dn"); //validation query
-    config.setValidationTimeout(3000);   //validation query timeout
-
-    HikariDataSource ds = new HikariDataSource(config); //create datasource
-    
-    Connection  connection = ds.getConnection(); // get connection
-    Statement statement = connection.createStatement(); // get statement
-    
-    //query or insert 
-    // ...
-    
-    connection.close(); // put back to conneciton pool
-}
-```
-> The close() method will not close the connection from HikariDataSource.getConnection(). Instead, the connection is put back to the connection pool. 
-> More instructions can refer to [User Guide][5]
-
-**Druid**
-
-* dependency in pom.xml：
-
-```xml
-<dependency>
-    <groupId>com.alibaba</groupId>
-    <artifactId>druid</artifactId>
-    <version>1.1.20</version>
-</dependency>
-```
-
-* Examples：
-```java
-public static void main(String[] args) throws Exception {
-    Properties properties = new Properties();
-    properties.put("driverClassName","com.taosdata.jdbc.TSDBDriver");
-    properties.put("url","jdbc:TAOS://127.0.0.1:6030/log");
-    properties.put("username","root");
-    properties.put("password","taosdata");
-
-    properties.put("maxActive","10"); //maximum number of connection in the pool
-    properties.put("initialSize","3");//initial number of connection
-    properties.put("maxWait","10000");//maximum wait milliseconds for get connection from pool
-    properties.put("minIdle","3");//minimum number of connection in the pool
-
-    properties.put("timeBetweenEvictionRunsMillis","3000");// the interval milliseconds to test connection
-
-    properties.put("minEvictableIdleTimeMillis","60000");//the minimum milliseconds to keep idle
-    properties.put("maxEvictableIdleTimeMillis","90000");//the maximum milliseconds to keep idle
-
-    properties.put("validationQuery","describe log.dn"); //validation query
-    properties.put("testWhileIdle","true"); // test connection while idle
-    properties.put("testOnBorrow","false"); // don't need while testWhileIdle is true
-    properties.put("testOnReturn","false"); // don't need while testWhileIdle is true
-    
-    //create druid datasource
-    DataSource ds = DruidDataSourceFactory.createDataSource(properties);
-    Connection  connection = ds.getConnection(); // get connection
-    Statement statement = connection.createStatement(); // get statement
-
-    //query or insert 
-    // ...
-
-    connection.close(); // put back to conneciton pool
-}
-```
-> More instructions can refer to [User Guide][6]
-
-**Notice**
-* TDengine `v1.6.4.1` provides a function `select server_status()` to check heartbeat. It is highly recommended to use this function for `Validation Query`.
-
-As follows，`1` will be returned if `select server_status()` is successfully executed。
-```shell
-taos> select server_status();
-server_status()|
-================
-1              |
-Query OK, 1 row(s) in set (0.000141s)
-```
-
-## Python Connector
-
-### Install TDengine Python client
-
-Users can find python client packages in our source code directory _src/connector/python_. There are two directories corresponding two python versions. Please choose the correct package to install. Users can use _pip_ command to install:
-
-```cmd
-pip install src/connector/python/python2/
-```
-
-or
-
-```
-pip install src/connector/python/python3/
-```
-
-If _pip_ command is not installed on the system, users can choose to install pip or just copy the _taos_ directory in the python client directory to the application directory to use.
-
-### Python client interfaces
-
-To use TDengine Python client, import TDengine module at first:
-
-```python
-import taos 
-```
-
-Users can get module information from Python help interface or refer to our [python code example](). We list the main classes and methods below:
-
-- _TDengineConnection_ class
-
-  Run `help(taos.TDengineConnection)` in python terminal for details.
-
-- _TDengineCursor_ class
-
-  Run `help(taos.TDengineCursor)` in python terminal for details.
-
-- connect method
-
-  Open a connection. Run `help(taos.connect)` in python terminal for details.
-
-## RESTful Connector
-
-TDengine also provides RESTful API to satisfy developing on different platforms. Unlike other databases, TDengine RESTful API applies operations to the database through the SQL command in the body of HTTP POST request. What users are required to provide is just a URL.
-
-
-For the time being, TDengine RESTful API uses a _\<TOKEN\>_ generated from username and password for identification. Safer identification methods will be provided in the future.
-
-
-### HTTP URL encoding 
-
-To use TDengine RESTful API, the URL should have the following encoding format:
-```
-http://<ip>:<PORT>/rest/sql
-```
-- _ip_: IP address of any node in a TDengine cluster
-- _PORT_: TDengine HTTP service port. It is 6020 by default.
-
-For example, the URL encoding _http://192.168.0.1:6020/rest/sql_ used to send HTTP request to a TDengine server with IP address as 192.168.0.1.
-
-It is required to add a token in an HTTP request header for identification.
-
-```
-Authorization: Basic <TOKEN>
-```
-
-The HTTP request body contains the SQL command to run. If the SQL command contains a table name, it should also provide the database name it belongs to in the form of `<db_name>.<tb_name>`. Otherwise, an error code is returned.
-
-For example, use _curl_ command to send a HTTP request:
-
-```
-curl -H 'Authorization: Basic <TOKEN>' -d '<SQL>' <ip>:<PORT>/rest/sql
-```
-
-or use
-
-```
-curl -u username:password -d '<SQL>' <ip>:<PORT>/rest/sql
-```
-
-where `TOKEN` is the encryted string of `{username}:{password}` using the Base64 algorithm, e.g. `root:taosdata` will be encoded as `cm9vdDp0YW9zZGF0YQ==`
-
-### HTTP response
-
-The HTTP resonse is in JSON format as below:
-
-```
-{
-    "status": "succ",
-    "head": ["column1","column2", …],
-    "data": [
-        ["2017-12-12 23:44:25.730", 1],
-        ["2017-12-12 22:44:25.728", 4]
-    ],
-    "rows": 2
-} 
-```
-Specifically,
-- _status_: the result of the operation, success or failure
-- _head_: description of returned result columns
-- _data_: the returned data array. If no data is returned, only an _affected_rows_ field is listed
-- _rows_: the number of rows returned
-
-### Example
-
-- Use _curl_ command to query all the data in table _t1_ of database _demo_:
-
-  `curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'select * from demo.t1' 192.168.0.1:6020/rest/sql`
-
-The return value is like:
-
-```
-{
-    "status": "succ",
-    "head": ["column1","column2","column3"],
-    "data": [
-        ["2017-12-12 23:44:25.730", 1, 2.3],
-        ["2017-12-12 22:44:25.728", 4, 5.6]
-    ],
-    "rows": 2
-}
-```
-
-- Use HTTP to create a database：
-
-  `curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'create database demo' 192.168.0.1:6020/rest/sql`
-
-    The return value should be:
-
-```
-{
-    "status": "succ",
-    "head": ["affected_rows"],
-    "data": [[1]],
-    "rows": 1,
-}
-```
-
-## Go Connector
-
-TDengine provides a GO client package `taosSql`. `taosSql` implements a kind of  interface of GO `database/sql/driver`. User can access TDengine by importing the package in their program with the following instructions, detailed usage please refer to `https://github.com/taosdata/driver-go/blob/develop/taosSql/driver_test.go`
-
-```Go
-import (
-    "database/sql"
-    _ github.com/taosdata/driver-go/taoSql“
-)
-```
-### API
-
-* `sql.Open(DRIVER_NAME string, dataSourceName string) *DB`
-
-   Open DB, generally DRIVER_NAME will be used as a constant with default value `taosSql`, dataSourceName is a combined String with format `user:password@/tcp(host:port)/dbname`. If user wants to access TDengine with multiple goroutine concurrently, the better way is to create an sql.Open object in each goroutine to access TDengine.
-
-  **Note**:	When calling this api, only a few initial work are done, instead the validity check happened during executing `Query` or `Exec`, at this time the connection will be created, and system will check if `user、password、host、port` is valid. Additionaly the most of features are implemented in the taosSql dependency lib `libtaos`, from this view, sql.Open is lightweight.
-
-*  `func (db *DB) Exec(query string, args ...interface{}) (Result, error)`
-
-  Execute non-Query related SQLs, the execution result is stored with type of Result.
-
-
-*  `func (db *DB) Query(query string, args ...interface{}) (*Rows, error)`
-
-  Execute Query related SQLs, the execution result is *Raw, the detailed usage can refer GO interface `database/sql/driver`
-
-## Node.js Connector
-
-TDengine also provides a node.js connector package that is installable through [npm](https://www.npmjs.com/). The package is also in our source code at *src/connector/nodejs/*. The following instructions are also available [here](https://github.com/taosdata/tdengine/tree/master/src/connector/nodejs)
-
-To get started, just type in the following to install the connector through [npm](https://www.npmjs.com/).
-
-```cmd
-npm install td-connector
-```
-
-It is highly suggested you use npm. If you don't have it installed, you can also just copy the nodejs folder from *src/connector/nodejs/* into your node project folder.
-
-To interact with TDengine, we make use of the [node-gyp](https://github.com/nodejs/node-gyp) library. To install, you will need to install the following depending on platform (the following instructions are quoted from node-gyp)
-
-### On Unix
-
-- `python` (`v2.7` recommended, `v3.x.x` is **not** supported)
-- `make`
-- A proper C/C++ compiler toolchain, like [GCC](https://gcc.gnu.org)
-
-### On macOS
-
-- `python` (`v2.7` recommended, `v3.x.x` is **not** supported) (already installed on macOS)
-
-- Xcode
-
-  - You also need to install the 
-
-    ```
-    Command Line Tools
-    ```
-
-     via Xcode. You can find this under the menu 
-
-    ```
-    Xcode -> Preferences -> Locations
-    ```
-
-     (or by running 
-
-    ```
-    xcode-select --install
-    ```
-
-     in your Terminal) 
-
-    - This step will install `gcc` and the related toolchain containing `make`
-
-### On Windows
-
-#### Option 1
-
-Install all the required tools and configurations using Microsoft's [windows-build-tools](https://github.com/felixrieseberg/windows-build-tools) using `npm install --global --production windows-build-tools` from an elevated PowerShell or CMD.exe (run as Administrator).
-
-#### Option 2
-
-Install tools and configuration manually:
-
-- Install Visual C++ Build Environment: [Visual Studio Build Tools](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=BuildTools) (using "Visual C++ build tools" workload) or [Visual Studio 2017 Community](https://visualstudio.microsoft.com/pl/thank-you-downloading-visual-studio/?sku=Community) (using the "Desktop development with C++" workload)
-- Install [Python 2.7](https://www.python.org/downloads/) (`v3.x.x` is not supported), and run `npm config set python python2.7` (or see below for further instructions on specifying the proper Python version and path.)
-- Launch cmd, `npm config set msvs_version 2017`
-
-If the above steps didn't work for you, please visit [Microsoft's Node.js Guidelines for Windows](https://github.com/Microsoft/nodejs-guidelines/blob/master/windows-environment.md#compiling-native-addon-modules) for additional tips.
-
-To target native ARM64 Node.js on Windows 10 on ARM, add the  components "Visual C++ compilers and libraries for ARM64" and "Visual  C++ ATL for ARM64".
-
-### Usage
-
-The following is a short summary of the basic usage of the connector, the  full api and documentation can be found [here](http://docs.taosdata.com/node)
-
-#### Connection
-
-To use the connector, first require the library ```td-connector```. Running the function ```taos.connect``` with the connection options passed in as an object will return a TDengine connection object. The required connection option is ```host```, other options if not set, will be the default values as shown below.
-
-A cursor also needs to be initialized in order to interact with TDengine from Node.js.
-
-```javascript
-const taos = require('td-connector');
-var conn = taos.connect({host:"127.0.0.1", user:"root", password:"taosdata", config:"/etc/taos",port:0})
-var cursor = conn.cursor(); // Initializing a new cursor
-```
-
-To close a connection, run
-
-```javascript
-conn.close();
-```
-
-#### Queries
-
-We can now start executing simple queries through the ```cursor.query``` function, which returns a TaosQuery object.
-
-```javascript
-var query = cursor.query('show databases;')
-```
-
-We can get the results of the queries through the ```query.execute()``` function, which returns a promise that resolves with a TaosResult object, which contains the raw data and additional functionalities such as pretty printing the results.
-
-```javascript
-var promise = query.execute();
-promise.then(function(result) {
-  result.pretty(); //logs the results to the console as if you were in the taos shell
-});
-```
-
-You can also query by binding parameters to a query by filling in the question marks in a string as so. The query will automatically parse what was binded and convert it to the proper format for use with TDengine
-
-```javascript
-var query = cursor.query('select * from meterinfo.meters where ts <= ? and areaid = ?;').bind(new Date(), 5);
-query.execute().then(function(result) {
-  result.pretty();
-})
-```
-
-The TaosQuery object can also be immediately executed upon creation by passing true as the second argument, returning a promise instead of a TaosQuery.
-
-```javascript
-var promise = cursor.query('select * from meterinfo.meters where v1 = 30;', true)
-promise.then(function(result) {
-  result.pretty();
-})
-```
-#### Async functionality
-
-Async queries can be performed using the same functions such as `cursor.execute`, `cursor.query`, but now with `_a` appended to them.
-
-Say you want to execute an two async query on two seperate tables, using `cursor.query_a`, you can do that and get a TaosQuery object, which upon executing with the `execute_a` function, returns a promise that resolves with a TaosResult object.
-
-```javascript
-var promise1 = cursor.query_a('select count(*), avg(v1), avg(v2) from meter1;').execute_a()
-var promise2 = cursor.query_a('select count(*), avg(v1), avg(v2) from meter2;').execute_a();
-promise1.then(function(result) {
-  result.pretty();
-})
-promise2.then(function(result) {
-  result.pretty();
-})
-```
-
-
-### Example
-
-An example of using the NodeJS connector to create a table with weather data and create and execute queries can be found [here](https://github.com/taosdata/TDengine/tree/master/tests/examples/nodejs/node-example.js) (The preferred method for using the connector)
-
-An example of using the NodeJS connector to achieve the same things but without all the object wrappers that wrap around the data returned to achieve higher functionality can be found [here](https://github.com/taosdata/TDengine/tree/master/tests/examples/nodejs/node-example-raw.js)
-
-[1]: https://search.maven.org/artifact/com.taosdata.jdbc/taos-jdbcdriver
-[2]: https://mvnrepository.com/artifact/com.taosdata.jdbc/taos-jdbcdriver
-[3]: https://github.com/taosdata/TDengine
-[4]: https://www.taosdata.com/blog/2019/12/03/jdbcdriver%e6%89%be%e4%b8%8d%e5%88%b0%e5%8a%a8%e6%80%81%e9%93%be%e6%8e%a5%e5%ba%93/
-[5]: https://github.com/brettwooldridge/HikariCP
-[6]: https://github.com/alibaba/druid
-[7]: https://github.com/taosdata/TDengine/issues
-[8]: https://search.maven.org/artifact/com.taosdata.jdbc/taos-jdbcdriver
-[9]: https://mvnrepository.com/artifact/com.taosdata.jdbc/taos-jdbcdriver
-[10]: https://maven.aliyun.com/mvn/search
-[11]:  https://github.com/taosdata/TDengine/tree/develop/tests/examples/JDBC/SpringJdbcTemplate
-[12]: https://github.com/taosdata/TDengine/tree/develop/tests/examples/JDBC/springbootdemo
-[13]: https://www.taosdata.com/cn/documentation20/administrator/#%E5%AE%A2%E6%88%B7%E7%AB%AF%E9%85%8D%E7%BD%AE
-[14]: https://www.taosdata.com/cn/documentation20/connector/#Windows
-[15]: https://www.taosdata.com/cn/getting-started/#%E5%BF%AB%E9%80%9F%E4%B8%8A%E6%89%8B
\ No newline at end of file
diff --git a/documentation20/webdocs/markdowndocs/Contributor_License_Agreement.md b/documentation20/webdocs/markdowndocs/Contributor_License_Agreement.md
deleted file mode 100644
index 8c158da4c5958384064b9993de6643be86b94fee..0000000000000000000000000000000000000000
--- a/documentation20/webdocs/markdowndocs/Contributor_License_Agreement.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# TaosData Contributor License Agreement
-
-This TaosData Contributor License Agreement (CLA) applies to any contribution you make to any TaosData projects. If you are representing your employing organization to sign this agreement, please warrant that you have the authority to grant the agreement.
-
-## Terms
-
-**"TaosData"**, **"we"**, **"our"** and **"us"** means TaosData, inc.
-
-**"You"** and **"your"** means you or the organization you are on behalf of to sign this agreement.
-
-**"Contribution"** means any original work you, or the organization you represent submit to TaosData for any project in any manner.
-
-## Copyright License
-
-All rights of your Contribution submitted to TaosData in any manner are granted to TaosData and recipients of software distributed by TaosData. You waive any rights that my affect our ownership of the copyright and grant to us a perpetual, worldwide, transferable, non-exclusive, no-charge, royalty-free, irrevocable, and sublicensable license to use, reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Contributions and any derivative work created based on a Contribution.
-
-## Patent License
-
-With respect to any patents you own or that you can license without payment to any third party, you grant to us and to any recipient of software distributed by us, a perpetual, worldwide, transferable, non-exclusive, no-charge, royalty-free, irrevocable patent license to make, have make, use, sell, offer to sell, import, and otherwise transfer the Contribution in whole or in part, alone or included in any product under any patent you own, or license from a third party, that is necessarily infringed by the Contribution or by combination of the Contribution with any Work.
-
-## Your Representations and Warranties
-
-You represent and warrant that:
-
-- the Contribution you submit is an original work that you can legally grant the rights set out in this agreement.
-
-- the Contribution you submit and licenses you granted does not and will not, infringe the rights of any third party.
-
-- you are not aware of any pending or threatened claims, suits, actions, or charges pertaining to the contributions. You also warrant to notify TaosData immediately if you become aware of any such actual or potential claims, suits, actions, allegations or charges.
-
-## Support
-
-You are not obligated to support your Contribution except you volunteer to provide support. If you want, you can provide for a fee.
-
-**I agree and accept on behalf of myself and behalf of my organization:**
\ No newline at end of file
diff --git a/documentation20/webdocs/markdowndocs/Documentation.md b/documentation20/webdocs/markdowndocs/Documentation.md
deleted file mode 100644
index bdafd40f7c76425a4f9734a2561b2b9a945c757f..0000000000000000000000000000000000000000
--- a/documentation20/webdocs/markdowndocs/Documentation.md
+++ /dev/null
@@ -1,87 +0,0 @@
-#Documentation 
-
-TDengine is a highly efficient platform to store, query, and analyze time-series data. It works like a relational database, but you are strongly suggested to read through the following documentation before you experience it.
-
-##Getting Started
-
-- Quick Start: download, install and experience TDengine in a few seconds
-- TDengine Shell: command-line interface to access TDengine server
-- Major Features: insert/query, aggregation, cache,  pub/sub, continuous query   
-
-## Data Model and Architecture
-
-- Data Model: relational database model, but one table for one device with static tags
-- Architecture: Management Module, Data Module, Client Module
-- Writing Process: records recieved are written to WAL, cache, then ack is sent back to client
-- Data Storage: records are sharded in the time range, and stored column by column 
-
-##TAOS SQL 
-
-- Data Types: support timestamp, int, float, double, binary, nchar, bool, and other types
-- Database Management: add, drop, check databases
-- Table Management: add, drop, check, alter tables
-- Inserting Records: insert one or more records into tables, historical records can be imported
-- Data Query: query data with time range and filter conditions, support limit/offset
-- SQL Functions: support aggregation, selector, transformation functions
-- Downsampling: aggregate data in successive time windows, support interpolation
-
-##STable: Super Table
-
-- What is a Super Table: an innovated way to aggregate tables
-- Create a STable: it is like creating a standard table, but with tags defined
-- Create a Table via STable: use STable as the template, with tags specified
-- Aggregate Tables via STable: group tables together by specifying the tags filter condition
-- Create Table Automatically: create tables automatically with a STable as a template
-- Management of STables: create/delete/alter super table just like standard tables
-- Management of Tags: add/delete/alter tags on super tables or tables  
-
-##Advanced Features
-
-- Continuous Query: query executed by TDengine periodically with a sliding window
-- Publisher/Subscriber: subscribe to the newly arrived data like a typical messaging system 
-- Caching: the newly arrived data of each device/table will always be cached
-
-##Connector
-
-- C/C++ Connector: primary method to connect to the server through libtaos client library
-- Java Connector: driver for connecting to the server from Java applications using the JDBC API
-- Python Connector: driver for connecting to the server from Python applications 
-- RESTful Connector: a simple way to interact with TDengine via HTTP
-- Go Connector: driver for connecting to the server from Go applications
-- Node.js Connector: driver for connecting to the server from node applications
-
-##Connections with Other Tools
-
-- Telegraf: pass the collected DevOps metrics to TDengine 
-- Grafana: query the data saved in TDengine and visualize them 
-- Matlab: access TDengine server from Matlab via JDBC
-- R: access TDengine server from R via JDBC 
-
-##Administrator
-
-- Directory and Files: files and directories related with TDengine
-- Configuration on Server: customize IP port, cache size, file block size and other settings
-- Configuration on Client: customize locale, default user and others   
-- User Management: add/delete users, change passwords
-- Import Data: import data into TDengine from either script or CSV file
-- Export Data: export data either from TDengine shell or from tool taosdump
-- Management of Connections, Streams, Queries: check or kill the connections, queries
-- System Monitor: collect the system metric, and log important operations
-
-##More on System Architecture
-
-- Storage Design: column-based storage with optimization on time-series data 
-- Query Design: an efficient way to query time-series data
-- Technical blogs to delve into the inside of TDengine
-
-## More on IoT Big Data
-
-- [Characteristics of IoT Big Data](https://www.taosdata.com/blog/2019/07/09/characteristics-of-iot-big-data/)
-- [Why don’t General Big Data Platforms Fit IoT Scenarios?](https://www.taosdata.com/blog/2019/07/09/why-does-the-general-big-data-platform-not-fit-iot-data-processing/)
-- [Why TDengine is the Best Choice for IoT Big Data Processing?](https://www.taosdata.com/blog/2019/07/09/why-tdengine-is-the-best-choice-for-iot-big-data-processing/)
-
-##Tutorials & FAQ
-
-- <a href='https://www.taosdata.com/en/faq'>FAQ</a>: a list of frequently asked questions and answers 
-- <a href='https://www.taosdata.com/en/blog/?categories=4'>Use cases</a>: a few typical cases to explain how to use TDengine in IoT platform
-
diff --git a/documentation20/webdocs/markdowndocs/Getting Started.md b/documentation20/webdocs/markdowndocs/Getting Started.md
deleted file mode 100644
index 4d34cb49f4a84ac6c9d63e47bc8230c150b9013e..0000000000000000000000000000000000000000
--- a/documentation20/webdocs/markdowndocs/Getting Started.md	
+++ /dev/null
@@ -1,151 +0,0 @@
-#Getting Started
-
-## Quick Start
-
-At the moment, TDengine only runs on Linux. You can set up and install it either from the  <a href='#Install-from-Source'>source code</a> or the <a href='#Install-from-Package'>packages</a>. It takes only a few seconds from download to run it successfully. 
-
-### Install from Source
-
-Please visit our [github page](https://github.com/taosdata/TDengine) for instructions on installation from the source code.
-
-### Install from Package
-
-Three different packages are provided, please pick up the one you like. 
-<ul id='packageList'>
-<li><a id='tdengine-rpm' style='color:var(--b2)'>TDengine RPM package (1.5M)</a></li>
-<li><a id='tdengine-deb' style='color:var(--b2)'>TDengine DEB package (1.7M)</a></li>
-<li><a id='tdengine-tar' style='color:var(--b2)'>TDengine Tarball (3.0M)</a></li>
-</ul>
-For the time being, TDengine only supports installation on Linux systems using [`systemd`](https://en.wikipedia.org/wiki/Systemd) as the service manager. To check if your system has *systemd* package, use the _which systemctl_ command.
-
-```cmd
-which systemctl
-```
-
-If the `systemd` package is not found, please [install from source code](#Install-from-Source). 
-
-### Running TDengine
-
-After installation, start the TDengine service by the `systemctl` command.
-
-```cmd
-systemctl start taosd
-```
-
-Then check if the server is working now.
-```cmd
-systemctl status taosd
-```
-
-If the service is running successfully, you can play around through TDengine shell `taos`, the command line interface tool located in directory /usr/local/bin/taos 
-
-**Note: The _systemctl_ command needs the root privilege. Use _sudo_ if you are not the _root_ user.**
-
-##TDengine Shell
-To launch TDengine shell, the command line interface, in a Linux terminal, type:
-
-```cmd
-taos
-```
-
-The welcome message is printed if the shell connects to TDengine server successfully, otherwise, an error message will be printed (refer to our [FAQ](../faq) page for troubleshooting the connection error). The TDengine shell prompt is: 
-
-```cmd
-taos>
-```
-
-In the TDengine shell, you can create databases, create tables and insert/query data with SQL. Each query command ends with a semicolon. It works like MySQL, for example:
-
-```mysql
-create database db;
-use db;
-create table t (ts timestamp, cdata int);
-insert into t values ('2019-07-15 10:00:00', 10);
-insert into t values ('2019-07-15 10:01:05', 20);
-select * from t;
-          ts          |   speed   |
-===================================
- 19-07-15 10:00:00.000|         10|
- 19-07-15 10:01:05.000|         20|
-Query OK, 2 row(s) in set (0.001700s)
-```
-
-Besides the SQL commands, the system administrator can check system status, add or delete accounts, and manage the servers.
-
-###Shell Command Line Parameters
-
-You can run `taos` command with command line options to fit your needs. Some frequently used options are listed below:
-
-- -c, --config-dir: set the configuration directory. It is _/etc/taos_ by default
-- -h, --host: set the IP address of the server it will connect to, Default is localhost
-- -s, --commands: set the command to run without entering the shell
-- -u, -- user:  user name to connect to server. Default is root
-- -p, --password: password. Default is 'taosdata'
-- -?, --help: get a full list of supported options 
-
-Examples:
-
-```cmd
-taos -h 192.168.0.1 -s "use db; show tables;"
-```
-
-###Run Batch Commands
-
-Inside TDengine shell, you can run batch commands in a file with *source* command.
-
-```
-taos> source <filename>;
-```
-
-### Tips
-
-- Use up/down arrow key to check the command history
-- To change the default password, use "`alter user`" command 
-- ctrl+c to interrupt any queries 
-- To clean the cached schema of tables or STables, execute command `RESET QUERY CACHE` 
-
-## Major Features
-
-The core functionality of TDengine is the time-series database. To reduce the development and management complexity, and to improve the system efficiency further, TDengine also provides caching, pub/sub messaging system, and stream computing functionalities. It provides a full stack for IoT big data platform. The detailed features are listed below:
-
-- SQL like query language used to insert or explore data
-
-- C/C++, Java(JDBC), Python, Go, RESTful, and Node.JS interfaces for development
-
-- Ad hoc queries/analysis via Python/R/Matlab or TDengine shell
-
-- Continuous queries to support sliding-window based stream computing
-
-- Super table to aggregate multiple time-streams efficiently with flexibility  
-
-- Aggregation over a time window on one or multiple time-streams
-
-- Built-in messaging system to support publisher/subscriber model
-
-- Built-in cache for each time stream to make latest data available as fast as light speed
-
-- Transparent handling of historical data and real-time data 
-
-- Integrating with Telegraf, Grafana and other tools seamlessly  
-
-- A set of tools or configuration to manage TDengine 
-
-
-For enterprise edition, TDengine provides more advanced features below:
-
-- Linear scalability to deliver higher capacity/throughput 
-
-- High availability to guarantee the carrier-grade service  
-
-- Built-in replication between nodes which may span multiple geographical sites 
-
-- Multi-tier storage to make historical data management simpler and cost-effective
-
-- Web-based management tools and other tools to make maintenance simpler
-
-TDengine is specially designed and optimized for time-series data processing in IoT, connected cars, Industrial IoT, IT infrastructure and application monitoring, and other scenarios. Compared with other solutions, it is 10x faster on insert/query speed. With a single-core machine, over 20K requestes can be processed, millions data points can be ingested, and over 10 million data points can be retrieved in a second. Via column-based storage and tuned compression algorithm for different data types, less than 1/10 storage space is required. 
-
-## Explore More on TDengine
-
-Please read through the whole <a href='../documentation'>documentation</a> to learn more about TDengine.
-
diff --git a/documentation20/webdocs/markdowndocs/More on System Architecture-ch.md b/documentation20/webdocs/markdowndocs/More on System Architecture-ch.md
deleted file mode 100644
index 44d572268de04662c190a6a5975c784b38aad117..0000000000000000000000000000000000000000
--- a/documentation20/webdocs/markdowndocs/More on System Architecture-ch.md	
+++ /dev/null
@@ -1,248 +0,0 @@
-# TDengine的技术设计
-
-## 存储设计
-
-TDengine的数据存储主要包含**元数据的存储**和**写入数据的存储**。以下章节详细介绍了TDengine各种数据的存储结构。
-
-### 元数据的存储
-
-TDengine中的元数据信息包括TDengine中的数据库，表，超级表等信息。元数据信息默认存放在 _/var/lib/taos/mgmt/_ 文件夹下。该文件夹的目录结构如下所示：
-```
-/var/lib/taos/
-      +--mgmt/
-          +--db.db
-          +--meters.db
-          +--user.db
-          +--vgroups.db
-```
-元数据在文件中按顺序排列。文件中的每条记录代表TDengine中的一个元数据机构（数据库、表等）。元数据文件只进行追加操作，即便是元数据的删除，也只是在数据文件中追加一条删除的记录。
-
-### 写入数据的存储
-
-TDengine中写入的数据在硬盘上是按时间维度进行分片的。同一个vnode中的表在同一时间范围内的数据都存放在同一文件组中，如下图中的v0f1804*文件。这一数据分片方式可以大大简化数据在时间维度的查询，提高查询速度。在默认配置下，硬盘上的每个文件存放10天数据。用户可根据需要调整数据库的 _daysPerFile_ 配置项进行配置。 数据在文件中是按块存储的。每个数据块只包含一张表的数据，且数据是按照时间主键递增排列的。数据在数据块中按列存储，这样使得同类型的数据存放在一起，可以大大提高压缩的比例，节省存储空间。TDengine对不同类型的数据采用了不同的压缩算法进行压缩，以达到最优的压缩结果。TDengine使用的压缩算法包括simple8B、delta-of-delta、RLE以及LZ4等。
-
-TDengine的数据文件默认存放在 */var/lib/taos/data/* 下。而 */var/lib/taos/tsdb/* 文件夹下存放了vnode的信息、vnode中表的信息以及数据文件的链接等。其完整目录结构如下所示：
-```
-/var/lib/taos/
-      +--tsdb/
-      |   +--vnode0
-      |        +--meterObj.v0
-      |        +--db/
-      |            +--v0f1804.head->/var/lib/taos/data/vnode0/v0f1804.head1
-      |            +--v0f1804.data->/var/lib/taos/data/vnode0/v0f1804.data
-      |            +--v0f1804.last->/var/lib/taos/data/vnode0/v0f1804.last1
-      |            +--v0f1805.head->/var/lib/taos/data/vnode0/v0f1805.head1
-      |            +--v0f1805.data->/var/lib/taos/data/vnode0/v0f1805.data
-      |            +--v0f1805.last->/var/lib/taos/data/vnode0/v0f1805.last1
-      |                   :
-      +--data/
-          +--vnode0/
-                +--v0f1804.head1
-                +--v0f1804.data
-                +--v0f1804.last1
-                +--v0f1805.head1
-                +--v0f1805.data
-                +--v0f1805.last1
-                        :
-```
-
-#### meterObj文件
-每个vnode中只存在一个 _meterObj_ 文件。该文件中存储了vnode的基本信息（创建时间，配置信息，vnode的统计信息等）以及该vnode中表的信息。其结构如下所示：
-```
-<文件开始>
-[文件头]
-[表记录1偏移量和长度]
-[表记录2偏移量和长度]
-...
-[表记录N偏移量和长度]
-[表记录1]
-[表记录2]
-...
-[表记录N]
-[表记录]
-<文件结尾>
-```
-其中，文件头大小为512字节，主要存放vnode的基本信息。每条表记录代表属于该vnode中的一张表在硬盘上的表示。
-
-#### head文件
-head文件中存放了其对应的data文件中数据块的索引信息。该文件组织形式如下：
-```
-<文件开始>
-[文件头]
-[表1偏移量]
-[表2偏移量]
-...
-[表N偏移量]
-[表1数据索引]
-[表2数据索引]
-...
-[表N数据索引]
-<文件结尾>
-```
-文件开头的偏移量列表表示对应表的数据索引块的开始位置在文件中的偏移量。每张表的数据索引信息在head文件中都是连续存放的。这也使得TDengine在读取单表数据时，可以将该表所有的数据块索引一次性读入内存，大大提高读取速度。表的数据索引块组织如下：
-```
-[索引块信息]
-[数据块1索引]
-[数据块2索引]
-...
-[数据块N索引]
-```
-其中，索引块信息中记录了数据块的个数等描述信息。每个数据块索引对应一个在data文件或last文件中的一个单独的数据块。索引信息中记录了数据块存放的文件、数据块起始位置的偏移量、数据块中数据时间主键的范围等。索引块中的数据块索引是按照时间范围顺序排放的，这也就是说，索引块M对应的数据块中的数据时间范围都大于索引块M-1的。这种预先排序的存储方式使得在TDengine在进行按照时间戳进行查询时可以使用折半查找算法，大大提高查询速度。
-
-#### data文件
-data文件中存放了真实的数据块。该文件只进行追加操作。其文件组织形式如下：
-```
-<文件开始>
-[文件头]
-[数据块1]
-[数据块2]
-...
-[数据块N]
-<文件结尾>
-```
-每个数据块只属于vnode中的一张表，且数据块中的数据按照时间主键排列。数据块中的数据按列组织排放，使得同一类型的数据排放在一起，方便压缩和读取。每个数据块的组织形式如下所示：
-```
-[列1信息]
-[列2信息]
-...
-[列N信息]
-[列1数据]
-[列2数据]
-...
-[列N数据]
-```
-列信息中包含该列的类型，列的压缩算法，列数据在文件中的偏移量以及长度等。除此之外，列信息中也包含该内存块中该列数据的预计算结果，从而在过滤查询时根据预计算结果判定是否读取数据块，大大提高读取速度。
-
-#### last文件
-为了防止数据块的碎片化，提高查询速度和压缩率，TDengine引入了last文件。当要落盘的数据块中的数据条数低于某个阈值时，TDengine会先将该数据块写入到last文件中进行暂时存储。当有新的数据需要落盘时，last文件中的数据会被读取出来与新数据组成新的数据块写入到data文件中。last文件的组织形式与data文件类似。
-
-### TDengine数据存储小结
-TDengine通过其创新的架构和存储结构设计，有效提高了计算机资源的使用率。一方面，TDengine的虚拟化使得TDengine的水平扩展及备份非常容易。另一方面，TDengine将表中数据按时间主键排序存储且其列式存储的组织形式都使TDengine在写入、查询以及压缩方面拥有非常大的优势。
-
-
-## 查询处理
-
-### 概述
-
-TDengine提供了多种多样针对表和超级表的查询处理功能，除了常规的聚合查询之外，还提供针对时序数据的窗口查询、统计聚合等功能。TDengine的查询处理需要客户端、管理节点、数据节点协同完成。 各组件包含的与查询处理相关的功能和模块如下：
-
-客户端（Client App）。客户端包含TAOS SQL的解析（SQL Parser）和查询请求执行器（Query Executor），第二阶段聚合器（Result Merger），连续查询管理器（Continuous Query Manager）等主要功能模块构成。SQL解析器负责对SQL语句进行解析校验，并转化为抽象语法树，查询执行器负责将抽象语法树转化查询执行逻辑，并根据SQL语句查询条件，将其转换为针对管理节点元数据查询和针对数据节点的数据查询两级查询处理。由于TAOS SQL当前不提供复杂的嵌套查询和pipeline查询处理机制，所以不再需要查询计划优化、逻辑查询计划到物理查询计划转换等过程。第二阶段聚合器负责将各数据节点查询返回的独立结果进行二阶段聚合生成最后的结果。连续查询管理器则负责针对用户建立的连续查询进行管理，负责定时拉起查询请求并按需将结果写回TDengine或返回给客户应用。此外，客户端还负责查询失败后重试、取消查询请求、以及维持连接心跳、向管理节点上报查询状态等工作。
-
-管理节点（Management Node）。管理节点保存了整个集群系统的全部数据的元数据信息，向客户端节点提供查询所需的数据的元数据，并根据集群的负载情况切分查询请求。通过超级表包含了通过该超级表创建的所有表的信息，因此查询处理器（Query Executor）负责针对标签（TAG）的查询处理，并将满足标签查询请求的表信息返回给客户端。此外，管理节点还维护集群的查询状态（Query Status Manager）维护，查询状态管理中在内存中临时保存有当前正在执行的全部查询，当客户端使用 *show queries* 命令的时候，将当前系统正在运行的查询信息返回客户端。
-
-数据节点（Data Node）。数据节点保存了数据库中全部数据内容，并通过查询执行器、查询处理调度器、查询任务队列（Query Task Queue）进行查询处理的调度执行，从客户端接收到的查询处理请求都统一放置到处理队列中，查询执行器从队列中获得查询请求，并负责执行。通过查询优化器（Query Optimizer）对于查询进行基本的优化处理，以及通过数据节点的查询执行器（Query Executor）扫描符合条件的数据单元并返回计算结果。等接收客户端发出的查询请求，执行查询处理，并将结果返回。同时数据节点还需要响应来自管理节点的管理信息和命令，例如 *kill query* 命令以后，需要即刻停止执行的查询任务。
-
-<center> <img src="../assets/fig1.png"> </center>
-<center>图 1. 系统查询处理架构图(只包含查询相关组件)</center>
-
-### 普通查询处理
-
-客户端、管理节点、数据节点协同完成TDengine的查询处理全流程。我们以一个具体的SQL查询为例，说明TDengine的查询处理流程。SQL语句向超级表*FOO_SUPER_TABLE*查询获取时间范围在2019年1月12日整天，标签TAG_LOC是'beijing'的表所包含的所有记录总数，SQL语句如下：
-
-```sql
-SELECT COUNT(*) 
-FROM FOO_SUPER_TABLE
-WHERE TAG_LOC = 'beijing' AND TS >= '2019-01-12 00:00:00' AND TS < '2019-01-13 00:00:00'
-```
-
-首先，客户端调用TAOS SQL解析器对SQL语句进行解析及合法性检查，然后生成语法树，并从中提取查询的对象 — 超级表 *FOO_SUPER_TABLE* ，然后解析器向管理节点（Management Node）请求其相应的元数据信息，并将过滤信息（TAG_LOC='beijing'）同时发送到管理节点。
-
-管理节点接收元数据获取的请求，首先找到超级表 *FOO_SUPER_TABLE* 基础信息，然后应用查询条件来过滤通过该超级表创建的全部表，最后满足查询条件（TAG_LOC='beijing'），即 *TAG_LOC* 标签列是 'beijing' 的的通过其查询执行器将满足查询要求的对象（表或超级表）的元数据信息返回给客户端。
-
-客户端获得了 *FOO_SUPER_TABLE* 的元数据信息后，查询执行器根据元数据中的数据分布，分别向保存有相应数据的节点发起查询请求，此时时间戳范围过滤条件（TS >= '2019-01-12 00:00:00' AND TS < '2019-01-13 00:00:00'）需要同时发送给全部的数据节点。
-
-数据节点接收到发自客户端的查询，转化为内部结构并进行优化以后将其放入任务执行队列，等待查询执行器执行。当查询结果获得以后，将查询结果返回客户端。数据节点执行查询的过程均相互独立，完全只依赖于自身的数据和内容进行计算。
-
-当所有查询涉及的数据节点返回结果后，客户端将每个数据节点查询的结果集再次进行聚合（针对本案例，即将所有结果再次进行累加），累加的结果即为最后的查询结果。第二阶段聚合并不是所有的查询都需要。例如，针对数据的列选取操作，实际上是不需要第二阶段聚合。
-
-### REST查询处理
-
-在 C/C++ 、Python接口、 JDBC 接口之外，TDengine 还提供基于 HTTP 协议的 REST 接口。不同于使用应用客户端开发程序进行的开发。当用户使用 REST 接口的时候，所有的查询处理过程都是在服务器端来完成，用户的应用服务不会参与数据库的计算过程，查询处理完成后结果通过 HTTP的 JSON 格式返回给用户。
-
-<center> <img src="../assets/fig2.png"> </center>
-<center>图 2.  REST查询架构</center>
-
-当用户使用基于HTTP的REST查询接口，HTTP的请求首先与位于数据节点的HTTP连接器（ Connector），建立连接，然后通过REST的签名机制，使用Token来确保请求的可靠性。对于数据节点，HTTP连接器接收到请求后，调用内嵌的客户端程序发起查询请求，内嵌客户端将解析通过HTTP连接器传递过来的SQL语句，解析该SQL语句并按需向管理节点请求元数据信息，然后向本机或集群中其他节点发送查询请求，最后按需聚合计算结果。HTTP连接器接收到请求SQL以后，后续的流程处理与采用应用客户端方式的查询处理完全一致。最后，还需要将查询的结果转换为JSON格式字符串，并通过HTTP 响应返回给客户端。
-
-可以看到，在处理HTTP流程的整个过程中，用户应用不再参与到查询处理的过程中，只负责通过HTTP协议发送SQL请求并接收JSON格式的结果。同时还需要注意的是，每个数据节点均内嵌了一个HTTP连接器和客户端程序，因此请求集群中任何一个数据节点，该数据节点均能够通过HTTP协议返回用户的查询结果。
-
-### 技术特征
-
-由于TDengine采用数据和标签分离存储的模式，能够极大地降低标签数据存储的冗余度。标签数据直接关联到每个表，并采用全内存的结构进行管理和维护标签数据,全内存的结构提供快速的查询处理，千万级别规模的标签数据查询可以在毫秒级别返回。首先针对标签数据的过滤可以有效地降低第二阶段的查询涉及的数据规模。为有效地提升查询处理的性能，针对物联网数据的不可更改的特点，TDengine采用在每个保存的数据块上，都记录下该数据块中数据的最大值、最小值、和等统计数据。如果查询处理涉及整个数据块的全部数据，则直接使用预计算结果，不再读取数据块的内容。由于预计算模块的大小远小于磁盘上存储的具体数据的大小，对于磁盘IO为瓶颈的查询处理，使用预计算结果可以极大地减小读取IO，并加速查询处理的流程。
-
-由于TDengine采用按列存储数据。当从磁盘中读取数据块进行计算的时候，按照查询列信息读取该列数据，并不需要读取其他不相关的数据，可以最小化读取数据。此外，由于采用列存储结构，数据节点针对数据的扫描采用该列数据块进行，可以充分利用CPU L2高速缓存，极大地加速数据扫描的速度。此外，对于某些查询，并不会等全部查询结果生成后再返回结果。例如，列选取查询，当第一批查询结果获得以后，数据节点直接将其返回客户端。同时，在查询处理过程中，系统在数据节点接收到查询请求以后马上返回客户端查询确认信息，并同时拉起查询处理过程，并等待查询执行完成后才返回给用户查询有响应。
-
-## TDengine集群设计
-
-### 1：集群与主要逻辑单元
-
-TDengine是基于硬件、软件系统不可靠、一定会有故障的假设进行设计的，是基于任何单台计算机都无足够能力处理海量数据的假设进行设计的。因此TDengine从研发的第一天起，就按照分布式高可靠架构进行设计，是完全去中心化的，是水平扩展的，这样任何单台或多台服务器宕机或软件错误都不影响系统的服务。通过节点虚拟化并辅以自动化负载均衡技术，TDengine能最大限度地利用异构集群中的计算和存储资源。而且只要数据副本数大于一，无论是硬软件的升级、还是IDC的迁移等都无需停止集群的服务，极大地保证系统的正常运行，并且降低了系统管理员和运维人员的工作量。
-
-下面的示例图上有八个物理节点，每个物理节点被逻辑的划分为多个虚拟节点。下面对系统的基本概念进行介绍。 
-
-
-
-![assets/nodes.png](../assets/nodes.png)
-
-**物理节点(dnode)**：集群中的一物理服务器或云平台上的一虚拟机。为安全以及通讯效率，一个物理节点可配置两张网卡，或两个IP地址。其中一张网卡用于集群内部通讯，其IP地址为**privateIp**, 另外一张网卡用于与集群外部应用的通讯，其IP地址为**publicIp**。在一些云平台（如阿里云），对外的IP地址是映射过来的，因此publicIp还有一个对应的内部IP地址**internalIp**(与privateIp不同)。对于只有一个IP地址的物理节点，publicIp, privateIp以及internalIp都是同一个地址，没有任何区别。一个dnode上有而且只有一个taosd实例运行。 
-
-**虚拟数据节点(vnode)**：在物理节点之上的可独立运行的基础逻辑单元，时序数据写入、存储、查询等操作逻辑都在虚拟节点中进行(图中V)，采集的时序数据就存储在vnode上。一个vnode包含固定数量的表。当创建一张新表时，系统会检查是否需要创建新的vnode。一个物理节点上能创建的vnode的数量取决于物理节点的硬件资源。一个vnode只属于一个DB，但一个DB可以有多个vnode。
-
-**虚拟数据节点组(vgroup)**: 位于不同物理节点的vnode可以组成一个虚拟数据节点组vnode group(如上图dnode0中的V0, dnode1中的V1, dnode6中的V2属于同一个虚拟节点组)。归属于同一个vgroup的虚拟节点采取master/slave的方式进行管理。写只能在master上进行，但采用asynchronous的方式将数据同步到slave，这样确保了一份数据在多个物理节点上有拷贝。如果master节点宕机，其他节点监测到后，将重新选举vgroup里的master, 新的master能继续处理数据请求，从而保证系统运行的可靠性。一个vgroup里虚拟节点个数就是数据的副本数。如果一个DB的副本数为N，系统必须有至少N个物理节点。副本数在创建DB时通过参数replica可以指定，缺省为1。使用TDengine, 数据的安全依靠多副本解决，因此不再需要昂贵的磁盘阵列等存储设备。
-
-**虚拟管理节点(mnode)**：负责所有节点运行状态的监控和维护，以及节点之间的负载均衡（图中M）。同时，虚拟管理节点也负责元数据(包括用户、数据库、表、静态标签等)的存储和管理，因此也称为Meta Node。TDengine集群中可配置多个(最多不超过5个) mnode，它们自动构建成为一个管理节点集群(图中M0, M1, M2)。mnode间采用master/slave的机制进行管理，而且采取强一致方式进行数据同步。mnode集群的创建由系统自动完成，无需人工干预。每个dnode上至多有一个mnode，而且每个dnode都知道整个集群中所有mnode的IP地址。 
-
-**taosc**：一个软件模块，是TDengine给应用提供的驱动程序（driver）,内嵌于JDBC、ODBC driver中，或者C语言连接库里。应用都是通过taosc而不是直接来与整个集群进行交互的。这个模块负责获取并缓存元数据；将插入、查询等请求转发到正确的虚拟节点；在把结果返回给应用时，还需要负责最后一级的聚合、排序、过滤等操作。对于JDBC, ODBC, C/C++接口而言，这个模块是在应用所处的计算机上运行，但消耗的资源很小。为支持全分布式的REST接口，taosc在TDengine集群的每个dnode上都有一运行实例。 
-
-**对外服务地址**：TDengine集群可以容纳单台、多台甚至几千台物理节点。应用只需要向集群中任何一个物理节点的publicIp发起连接即可。启动CLI应用taos时，选项-h需要提供的就是publicIp。
-
-**master/secondIp**：每一个dnode都需要配置一个masterIp。dnode启动后，将对配置的masterIp发起加入集群的连接请求。masterIp是已经创建的集群中的任何一个节点的privateIp，对于集群中的第一个节点，就是它自己的privateIp。为保证连接成功，每个dnode还可配置secondIp, 该IP地址也是已创建的集群中的任何一个节点的privateIp。如果一个节点连接masterIp失败,它将试图连接secondIp。
-
-dnode启动后，会获知集群的mnode IP列表，并且定时向mnode发送状态信息。
-
-vnode与mnode只是逻辑上的划分，都是执行程序taosd里的不同线程而已，无需安装不同的软件，做任何特殊的配置。最小的系统配置就是一个物理节点,vnode,mnode和taosc都存在而且都正常运行，但单一节点无法保证系统的高可靠。 
-
-### 2：一典型的操作流程
-
-为解释vnode, mnode, taosc和应用之间的关系以及各自扮演的角色，下面对写入数据这个典型操作的流程进行剖析。
-
- 
-
-![Picture1](../assets/Picture2.png)
-
- 
-
-1. 应用通过JDBC、ODBC或其他API接口发起插入数据的请求。
-2. taosc会检查缓存，看是有保存有该表的meta data。如果有，直接到第4步。如果没有，taosc将向mnode发出get meta-data请求。
-3. mnode将该表的meta-data返回给taosc。Meta-data包含有该表的schema, 而且还有该表所属的vgroup信息（vnode ID以及所在的dnode的IP地址，如果副本数为N，就有N组vnodeID/IP)。如果taosc迟迟得不到mnode回应，而且存在多个mnode,taosc将向下一个mnode发出请求。
-4. taosc向master vnode发起插入请求。
-5. vnode插入数据后，给taosc一个应答，表示插入成功。如果taosc迟迟得不到vnode的回应，taosc会认为该节点已经离线。这种情况下，如果被插入的数据库有多个副本，taosc将向vgroup里下一个vnode发出插入请求。
-6. taosc通知APP，写入成功。 
-
-对于第二和第三步，taosc启动时，并不知道mnode的IP地址，因此会直接向配置的集群对外服务的IP地址发起请求。如果接收到该请求的dnode并没有配置mnode，该dnode会在回复的消息中告知mnode的IP地址列表（如果有多个dnodes，mnode的IP地址可以有多个），这样taosc会重新向新的mnode的IP地址发出获取meta-data的请求。
-
-对于第四和第五步，没有缓存的情况下，taosc无法知道虚拟节点组里谁是master，就假设第一个vnodeID/IP就是master,向它发出请求。如果接收到请求的vnode并不是master,它会在回复中告知谁是master，这样taosc就向建议的master vnode发出请求。一旦得到插入成功的回复，taosc会缓存住master节点的信息。
-
-上述是插入数据的流程，查询、计算的流程也完全一致。taosc把这些复杂的流程全部封装屏蔽了，因此应用无需处理重定向、获取meta data等细节，完全是透明的。
-
-通过taosc缓存机制，只有在第一次对一张表操作时，才需要访问mnode, 因此mnode不会成为系统瓶颈。但因为schema有可能变化，而且vgroup有可能发生改变（比如负载均衡发生），因此taosc需要定时自动刷新缓存。
-
-### 3：数据分区
-
-vnode(虚拟数据节点)保存采集的时序数据，而且查询、计算都在这些节点上进行。为便于负载均衡、数据恢复、支持异构环境，TDengine将一个物理节点根据其计算和存储资源切分为多个vnode。这些vnode的管理是TDengine自动完成的，对应用完全透明。 
-
-对于单独一个数据采集点，无论其数据量多大，一个vnode（或vnode group, 如果副本数大于1）有足够的计算资源和存储资源来处理（如果每秒生成一条16字节的记录，一年产生的原始数据不到0.5G），因此TDengine将一张表的所有数据都存放在一个vnode里，而不会让同一个采集点的数据分布到两个或多个dnode上。而且一个vnode可存储多张表的数据，一个vnode可容纳的表的数目由配置参数tables指定，缺省为2000。设计上，一个vnode里所有的表都属于同一个DB。因此一个数据库DB需要的vnode或vgroup的个数等于：数据库表的数目/tables。 
-
-创建DB时，系统并不会马上分配资源。但当创建一张表时，系统将看是否有已经分配的vnode, 而且是否有空位，如果有，立即在该有空位的vnode创建表。如果没有，系统将从集群中，根据当前的负载情况，在一个dnode上创建一新的vnode, 然后创建表。如果DB有多个副本，系统不是只创建一个vnode，而是一个vgroup(虚拟数据节点组)。系统对vnode的数目没有任何限制，仅仅受限于物理节点本身的计算和存储资源。
-
-参数tables的设置需要考虑具体场景，创建DB时，可以个性化指定该参数。该参数不宜过大，也不宜过小。过小，极端情况，就是每个数据采集点一个vnode, 这样导致系统数据文件过多。过大，虚拟化带来的优势就会丧失。给定集群计算资源的情况下，整个系统vnode的个数应该是CPU核的数目的两倍以上。
-
-### 4：负载均衡
-
-每个dnode(物理节点)都定时向 mnode(虚拟管理节点)报告其状态（包括硬盘空间、内存大小、CPU、网络、虚拟节点个数等），因此mnode了解整个集群的状态。基于整体状态，当mnode发现某个dnode负载过重，它会将dnode上的一个或多个vnode挪到其他dnode。在挪动过程中，对外服务继续进行，数据插入、查询和计算操作都不受影响。负载均衡操作结束后，应用也无需重启，将自动连接新的vnode。 
-
-如果mnode一段时间没有收到dnode的状态报告，mnode会认为这个dnode已经离线。如果离线时间超过一定时长（时长由配置参数offlineThreshold决定），该dnode将被mnode强制剔除出集群。该dnode上的vnodes如果副本数大于一，系统将自动在其他dnode上创建新的副本，以保证数据的副本数。
-
-
-
-**Note：**目前集群功能仅仅限于企业版
diff --git a/documentation20/webdocs/markdowndocs/More on System Architecture.md b/documentation20/webdocs/markdowndocs/More on System Architecture.md
deleted file mode 100644
index d7a38b99a3ae5a630509f3ef0f0ffdc97d3aaaf1..0000000000000000000000000000000000000000
--- a/documentation20/webdocs/markdowndocs/More on System Architecture.md	
+++ /dev/null
@@ -1,176 +0,0 @@
-# TDengine System Architecture 
-
-## Storage Design
-
-TDengine data mainly include **metadata** and **data** that we will introduce in the following sections.
-
-### Metadata Storage
-
-Metadata include the information of databases, tables, etc. Metadata files are saved in _/var/lib/taos/mgmt/_ directory by default. The directory tree is as below:
-```
-/var/lib/taos/
-      +--mgmt/
-          +--db.db
-          +--meters.db
-          +--user.db
-          +--vgroups.db
-```
-
-A metadata structure (database, table, etc.) is saved as a record in a metadata file. All metadata files are appended only, and even a drop operation adds a deletion record at the end of the file.
-
-### Data storage
-
-Data in TDengine are sharded according to the time range. Data of tables in the same vnode in a certain time range are saved in the same filegroup, such as files v0f1804*. This sharding strategy can effectively improve data searching speed. By default, a group of files contains data in 10 days, which can be configured by *daysPerFile* in the configuration file or by *DAYS* keyword in *CREATE DATABASE* clause. Data in files are blockwised. A data block only contains one table's data. Records in the same data block are sorted according to the primary timestamp, which helps to improve the compression rate and save storage. The compression algorithms used in TDengine include simple8B, delta-of-delta, RLE, LZ4, etc.
-
-By default, TDengine data are saved in */var/lib/taos/data/* directory. _/var/lib/taos/tsdb/_ directory contains vnode informations and data file linkes.
-
-```
-/var/lib/taos/
-      +--tsdb/
-      |   +--vnode0
-      |        +--meterObj.v0
-      |        +--db/
-      |            +--v0f1804.head->/var/lib/taos/data/vnode0/v0f1804.head1
-      |            +--v0f1804.data->/var/lib/taos/data/vnode0/v0f1804.data
-      |            +--v0f1804.last->/var/lib/taos/data/vnode0/v0f1804.last1
-      |            +--v0f1805.head->/var/lib/taos/data/vnode0/v0f1805.head1
-      |            +--v0f1805.data->/var/lib/taos/data/vnode0/v0f1805.data
-      |            +--v0f1805.last->/var/lib/taos/data/vnode0/v0f1805.last1
-      |                   :
-      +--data/
-          +--vnode0/
-                +--v0f1804.head1
-                +--v0f1804.data
-                +--v0f1804.last1
-                +--v0f1805.head1
-                +--v0f1805.data
-                +--v0f1805.last1
-                        :
-```
-
-#### meterObj file
-There are only one meterObj file in a vnode. Informations bout the vnode, such as created time, configuration information, vnode statistic informations are saved in this file. It has the structure like below:
-
-```
-<start_of_file>
-[file_header]
-[table_record1_offset&length]
-[table_record2_offset&length]
-...
-[table_recordN_offset&length]
-[table_record1]
-[table_record2]
-...
-[table_recordN]
-<end_of_file>
-```
-The file header takes 512 bytes, which mainly contains informations about the vnode. Each table record is the representation of a table on disk.
-
-#### head file
-The _head_ files contain the index of data blocks in the _data_ file. The inner organization is as below:
-```
-<start_of_file>
-[file_header]
-[table1_offset]
-[table2_offset]
-...
-[tableN_offset]
-[table1_index_block]
-[table2_index_block]
-...
-[tableN_index_block]
-<end_of_file>
-```
-The table offset array in the _head_ file saves the information about the offsets of each table index block. Indices on data blocks in the same table are saved continuously. This also makes it efficient to load data indices on the same table. The data index block has a structure like:
-
-```
-[index_block_info]
-[block1_index]
-[block2_index]
-...
-[blockN_index]
-```
-The index block info part contains the information about the index block such as the number of index blocks, etc. Each block index corresponds to a real data block in the _data_ file or _last_ file. Information about the location of the real data block, the primary timestamp range of the data block, etc. are all saved in the block index part. The block indices are sorted in ascending order according to the primary timestamp. So we can apply algorithms such as the binary search on the data to efficiently search blocks according to time.
-
-#### data file
-The _data_ files store the real data block. They are append-only. The organization is as:
-```
-<start_of_file>
-[file_header]
-[block1]
-[block2]
-...
-[blockN]
-<end_of_file>
-```
-A data block in _data_ files only belongs to a table in the vnode and the records in a data block are sorted in ascending order according to the primary timestamp key. Data blocks are column-oriented. Data in the same column are stored contiguously, which improves reading speed and compression rate because of their similarity. A data block has the following organization:
-
-```
-[column1_info]
-[column2_info]
-...
-[columnN_info]
-[column1_data]
-[column2_data]
-...
-[columnN_data]
-```
-The column info part includes information about column types, column compression algorithm, column data offset and length in the _data_ file, etc. Besides, pre-calculated results of the column data in the block are also in the column info part, which helps to improve reading speed by avoiding loading data block necessarily.
-
-#### last file
-To avoid storage fragment and to import query speed and compression rate, TDengine introduces an extra file, the _last_ file. When the number of records in a data block is lower than a threshold, TDengine will flush the block to the _last_ file for temporary storage. When new data comes, the data in the _last_ file will be merged with the new data and form a larger data block and written to the _data_ file. The organization of the _last_ file is similar to the _data_ file.
-
-### Summary
-The innovation in architecture and storage design of TDengine improves resource usage. On the one hand, the virtualization makes it easy to distribute resources between different vnodes and for future scaling. On the other hand, sorted and column-oriented storage makes TDengine have a great advantage in writing, querying and compression.
-
-## Query Design
-
-#### Introduction
-
-TDengine provides a variety of query functions for both tables and super tables. In addition to regular aggregate queries, it also provides time window based query and statistical aggregation for time series data. TDengine's query processing requires the client app, management node, and data node to work together. The functions and modules involved in query processing included in each component are as follows:
-
-Client (Client App). The client development kit, embed in a client application, consists of TAOS SQL parser and query executor, the second-stage aggregator (Result Merger), continuous query manager and other major functional modules. The SQL parser is responsible for parsing and verifying the SQL statement and converting it into an abstract syntax tree. The query executor is responsible for transforming the abstract syntax tree into the query execution logic and creates the metadata query according to the query condition of the SQL statement. Since TAOS SQL does not currently include complex nested queries and pipeline query processing mechanism, there is no longer need for query plan optimization and physical query plan conversions. The second-stage aggregator is responsible for performing the aggregation of the independent results returned by query involved data nodes at the client side to generate final results. The continuous query manager is dedicated to managing the continuous queries created by users, including issuing fixed-interval query requests and writing the results back to TDengine or returning to the client application as needed. Also, the client is also responsible for retrying after the query fails, canceling the query request, and maintaining the connection heartbeat and reporting the query status to the management node.
-
-Management Node. The management node keeps the metadata of all the data of the entire cluster system, provides the metadata of the data required for the query from the client node, and divides the query request according to the load condition of the cluster. The super table contains information about all the tables created according to the super table, so the query processor (Query Executor) of the management node is responsible for the query processing of the tags of tables and returns the table information satisfying the tag query. Besides, the management node maintains the query status of the cluster in the Query Status Manager component, in which the metadata of all queries that are currently executing are temporarily stored in-memory buffer. When the client issues *show queries* command to management node, current running queries information is returned to the client.
-
-Data Node. The data node, responsible for storing all data of the database, consists of query executor, query processing scheduler, query task queue, and other related components. Once the query requests from the client received, they are put into query task queue and waiting to be processed by query executor. The query executor extracts the query request from the query task queue and invokes the query optimizer to perform the basic optimization for the query execution plan. And then query executor scans the qualified data blocks in both cache and disk to obtain qualified data and return the calculated results. Besides, the data node also needs to respond to management information and commands from the management node. For example, after the *kill query* received from the management node, the query task needs to be stopped immediately.
-
-<center> <img src="../assets/fig1.png"> </center>
-<center>Fig 1. System query processing architecture diagram (only query related components)</center>
-
-#### Query Process Design
-
-The client, the management node, and the data node cooperate to complete the entire query processing of TDengine. Let's take a concrete SQL query as an example to illustrate the whole query processing flow. The SQL statement is to query on super table *FOO_SUPER_TABLE* to get the total number of records generated on January 12, 2019, from the table, of which TAG_LOC equals to 'beijing'.  The SQL statement is as follows:
-
-```sql
-SELECT COUNT(*) 
-FROM FOO_SUPER_TABLE
-WHERE TAG_LOC = 'beijing' AND TS >= '2019-01-12 00:00:00' AND TS < '2019-01-13 00:00:00'
-```
-
-First, the client invokes the TAOS SQL parser to parse and validate the SQL statement, then generates a syntax tree, and extracts the object of the query - the super table *FOO_SUPER_TABLE*, and then the parser sends requests with filtering information (TAG_LOC='beijing') to management node to get the corresponding metadata about *FOO_SUPER_TABLE*.
-
-Once the management node receives the request for metadata acquisition, first finds the super table *FOO_SUPER_TABLE* basic information, and then applies the query condition (TAG_LOC='beijing') to filter all the related tables created according to it. And finally, the query executor returns the metadata information that satisfies the query request to the client.
-
-After the client obtains the metadata information of *FOO_SUPER_TABLE*, the query executor initiates a query request with timestamp range filtering condition (TS >= '2019- 01-12 00:00:00' AND TS < '2019-01-13 00:00:00') to all nodes that hold the corresponding data according to the information about data distribution in metadata.
-
-The data node receives the query sent from the client, converts it into an internal structure and puts it into the query task queue to be executed by query executor after optimizing the execution plan. When the query result is obtained, the query result is returned to the client. It should be noted that the data nodes perform the query process independently of each other, and rely solely on their data and content for processing.
-
-When all data nodes involved in the query return results, the client aggregates the result sets from each data node. In this case, all results are accumulated to generate the final query result. The second stage of aggregation is not always required for all queries. For example, a column selection query does not require a second-stage aggregation at all.
-
-#### REST Query Process
-
-In addition to C/C++, Python, and JDBC interface, TDengine also provides a REST interface based on the HTTP protocol, which is different from using the client application programming interface. When the user uses the REST interface, all the query processing is completed on the server-side, and the user's application is not involved in query processing anymore. After the query processing is completed, the result is returned to the client through the HTTP JSON string.
-
-<center> <img src="../assets/fig2.png"> </center>
-<center>Fig. 2 REST query architecture</center>
-
-When a client uses an HTTP-based REST query interface, the client first establishes a connection with the HTTP connector at the data node and then uses the token to ensure the reliability of the request through the REST signature mechanism. For the data node, after receiving the request, the HTTP connector invokes the embedded client program to initiate a query processing, and then the embedded client parses the SQL statement from the HTTP connector and requests the management node to get metadata as needed. After that, the embedded client sends query requests to the same data node or other nodes in the cluster and aggregates the calculation results on demand. Finally, you also need to convert the result of the query into a JSON format string and return it to the client via an HTTP response. After the HTTP connector receives the request SQL, the subsequent process processing is completely consistent with the query processing using the client application development kit.
-
-It should be noted that during the entire processing, the client application is no longer involved in, and is only responsible for sending SQL requests through the HTTP protocol and receiving the results in JSON format. Besides, each data node is embedded with an HTTP connector and a client, so any data node in the cluster received requests from a client, the data node can initiate the query and return the result to the client through the HTTP protocol, with transfer the request to other data nodes.
-
-#### Technology
-
-Because TDengine stores data and tags value separately, the tag value is kept in the management node and directly associated with each table instead of records, resulting in a great reduction of the data storage. Therefore, the tag value can be managed by a fully in-memory structure. First, the filtering of the tag data can drastically reduce the data size involved in the second phase of the query. The query processing for the data is performed at the data node. TDengine takes advantage of the immutable characteristics of IoT data by calculating the maximum, minimum, and other statistics of the data in one data block on each saved data block, to effectively improve the performance of query processing. If the query process involves all the data of the entire data block, the pre-computed result is used directly, and the content of the data block is no longer needed. Since the size of disk space required to store the pre-computation result is much smaller than the size of the specific data, the pre-computation result can greatly reduce the disk IO and speed up the query processing.
-
-TDengine employs column-oriented data storage techniques. When the data block is involved to be loaded from the disk for calculation, only the required column is read according to the query condition, and the read overhead can be minimized. The data of one column is stored in a contiguous memory block and therefore can make full use of the CPU L2 cache to greatly speed up the data scanning. Besides, TDengine utilizes the eagerly responding mechanism and returns a partial result before the complete result is acquired. For example, when the first batch of results is obtained, the data node immediately returns it directly to the client in case of a column select query. 
\ No newline at end of file
diff --git a/documentation20/webdocs/markdowndocs/Super Table-ch.md b/documentation20/webdocs/markdowndocs/Super Table-ch.md
deleted file mode 100644
index e5c77471570a76e608d59a0dca10462315460337..0000000000000000000000000000000000000000
--- a/documentation20/webdocs/markdowndocs/Super Table-ch.md	
+++ /dev/null
@@ -1,224 +0,0 @@
-# 超级表STable：多表聚合
-
-TDengine要求每个数据采集点单独建表，这样能极大提高数据的插入/查询性能，但是导致系统中表的数量猛增，让应用对表的维护以及聚合、统计操作难度加大。为降低应用的开发难度，TDengine引入了超级表STable (Super Table)的概念。
-
-## 什么是超级表
-
-STable是同一类型数据采集点的抽象，是同类型采集实例的集合，包含多张数据结构一样的子表。每个STable为其子表定义了表结构和一组标签：表结构即表中记录的数据列及其数据类型；标签名和数据类型由STable定义，标签值记录着每个子表的静态信息，用以对子表进行分组过滤。子表本质上就是普通的表，由一个时间戳主键和若干个数据列组成，每行记录着具体的数据，数据查询操作与普通表完全相同；但子表与普通表的区别在于每个子表从属于一张超级表，并带有一组由STable定义的标签值。每种类型的采集设备可以定义一个STable。数据模型定义表的每列数据的类型，如温度、压力、电压、电流、GPS实时位置等，而标签信息属于Meta Data，如采集设备的序列号、型号、位置等，是静态的，是表的元数据。用户在创建表（数据采集点）时指定STable(采集类型)外，还可以指定标签的值，也可事后增加或修改。
-
-TDengine扩展标准SQL语法用于定义STable，使用关键词tags指定标签信息。语法如下：
-
-```mysql
-CREATE TABLE <stable_name> (<field_name> TIMESTAMP, field_name1 field_type,…)   TAGS(tag_name tag_type, …) 
-```
-
-其中tag_name是标签名，tag_type是标签的数据类型。标签可以使用时间戳之外的其他TDengine支持的数据类型，标签的个数最多为6个，名字不能与系统关键词相同，也不能与其他列名相同。如：
-
-```mysql
-create table thermometer (ts timestamp, degree float) 
-tags (location binary(20), type int)
-```
-
-上述SQL创建了一个名为thermometer的STable，带有标签location和标签type。
-
-为某个采集点创建表时，可以指定其所属的STable以及标签的值，语法如下：
-
-```mysql
-CREATE TABLE <tb_name> USING <stb_name> TAGS (tag_value1,...)
-```
-
-沿用上面温度计的例子，使用超级表thermometer建立单个温度计数据表的语句如下：
-
-```mysql
-create table t1 using thermometer tags (‘beijing’, 10)
-```
-
-上述SQL以thermometer为模板，创建了名为t1的表，这张表的Schema就是thermometer的Schema，但标签location值为‘beijing’，标签type值为10。
-
-用户可以使用一个STable创建数量无上限的具有不同标签的表，从这个意义上理解，STable就是若干具有相同数据模型，不同标签的表的集合。与普通表一样，用户可以创建、删除、查看超级表STable，大部分适用于普通表的查询操作都可运用到STable上，包括各种聚合和投影选择函数。除此之外，可以设置标签的过滤条件，仅对STbale中部分表进行聚合查询，大大简化应用的开发。
-
-TDengine对表的主键（时间戳）建立索引，暂时不提供针对数据模型中其他采集量（比如温度、压力值）的索引。每个数据采集点会采集若干数据记录，但每个采集点的标签仅仅是一条记录，因此数据标签在存储上没有冗余，且整体数据规模有限。TDengine将标签数据与采集的动态数据完全分离存储，而且针对STable的标签建立了高性能内存索引结构，为标签提供全方位的快速操作支持。用户可按照需求对其进行增删改查（Create，Retrieve，Update，Delete，CRUD）操作。
-
-STable从属于库，一个STable只属于一个库，但一个库可以有一到多个STable, 一个STable可有多个子表。
-
-## 超级表管理
-
-- 创建超级表
-
-    ```mysql
-    CREATE TABLE <stable_name> (<field_name> TIMESTAMP, field_name1 field_type,…) TAGS(tag_name tag_type, …)
-    ```
-
-    与创建表的SQL语法相似。但需指定TAGS字段的名称和类型。 
-
-    说明：
-
-    1. TAGS列总长度不能超过512 bytes；
-    2. TAGS列的数据类型不能是timestamp和nchar类型；
-    3. TAGS列名不能与其他列名相同;
-    4. TAGS列名不能为预留关键字. 
-
-- 显示已创建的超级表
-
-    ```mysql
-    show stables;
-    ```
-
-    查看数据库内全部STable，及其相关信息，包括STable的名称、创建时间、列数量、标签（TAG）数量、通过该STable建表的数量。 
-
-- 删除超级表
-
-    ```mysql
-    DROP TABLE <stable_name>
-    ```
-
-    Note: 删除STable不会级联删除通过STable创建的表；相反删除STable时要求通过该STable创建的表都已经被删除。
-
-- 查看属于某STable并满足查询条件的表
-
-    ```mysql
-    SELECT TBNAME,[TAG_NAME,…] FROM <stable_name> WHERE <tag_name> <[=|=<|>=|<>] values..> ([AND|OR] …)
-    ```
-
-    查看属于某STable并满足查询条件的表。说明：TBNAME为关键词，显示通过STable建立的子表表名，查询过程中可以使用针对标签的条件。
-
-    ```mysql
-    SELECT COUNT(TBNAME) FROM <stable_name> WHERE <tag_name> <[=|=<|>=|<>] values..> ([AND|OR] …)
-    ```
-
-    统计属于某个STable并满足查询条件的子表的数量
-
-## 写数据时自动建子表
-
-在某些特殊场景中，用户在写数据时并不确定某个设备的表是否存在，此时可使用自动建表语法来实现写入数据时里用超级表定义的表结构自动创建不存在的子表，若该表已存在则不会建立新表。注意：自动建表语句只能自动建立子表而不能建立超级表，这就要求超级表已经被事先定义好。自动建表语法跟insert/import语法非常相似，唯一区别是语句中增加了超级表和标签信息。具体语法如下：
-
-```mysql
-INSERT INTO <tb_name> USING <stb_name> TAGS (<tag1_value>, ...) VALUES (field_value, ...) (field_value, ...) ...;
-```
-
-向表tb_name中插入一条或多条记录，如果tb_name这张表不存在，则会用超级表stb_name定义的表结构以及用户指定的标签值(即tag1_value…)来创建名为tb_name新表，并将用户指定的值写入表中。如果tb_name已经存在，则建表过程会被忽略，系统也不会检查tb_name的标签是否与用户指定的标签值一致，也即不会更新已存在表的标签。
-
-```mysql
-INSERT INTO <tb1_name> USING <stb1_name> TAGS (<tag1_value1>, ...) VALUES (<field1_value1>, ...) (<field1_value2>, ...) ... <tb_name2> USING <stb_name2> TAGS(<tag1_value2>, ...) VALUES (<field1_value1>, ...) ...;
-```
-
-向多张表tb1_name，tb2_name等插入一条或多条记录，并分别指定各自的超级表进行自动建表。
-
-## STable中TAG管理
-
-除了更新标签的值的操作是针对子表进行，其他所有的标签操作（添加标签、删除标签等）均只能作用于STable，不能对单个子表操作。对STable添加标签以后，依托于该STable建立的所有表将自动增加了一个标签，对于数值型的标签，新增加的标签的默认值是0.
-
-- 添加新的标签
-
-    ```mysql
-    ALTER TABLE <stable_name> ADD TAG <new_tag_name> <TYPE>
-    ```
-
-    为STable增加一个新的标签，并指定新标签的类型。标签总数不能超过6个。
-
-- 删除标签
-
-    ```mysql
-    ALTER TABLE <stable_name> DROP TAG <tag_name>
-    ```
-
-    删除超级表的一个标签，从超级表删除某个标签后，该超级表下的所有子表也会自动删除该标签。
-
-    	说明：第一列标签不能删除，至少需要为STable保留一个标签。
-
-- 修改标签名
-
-    ```mysql
-    ALTER TABLE <stable_name> CHANGE TAG <old_tag_name> <new_tag_name>
-    ```
-
-    	修改超级表的标签名，从超级表修改某个标签名后，该超级表下的所有子表也会自动更新该标签名。
-
-- 修改子表的标签值
-
-    ```mysql
-    ALTER TABLE <table_name> SET TAG <tag_name>=<new_tag_value>
-    ```
-
-## STable多表聚合
-
-针对所有的通过STable创建的子表进行多表聚合查询，支持按照全部的TAG值进行条件过滤，并可将结果按照TAGS中的值进行聚合，暂不支持针对binary类型的模糊匹配过滤。语法如下：
-
-```mysql
-SELECT function<field_name>,… 
- FROM <stable_name> 
- WHERE <tag_name> <[=|<=|>=|<>] values..> ([AND|OR] …)
- INTERVAL (<interval> [, offset])
- GROUP BY <tag_name>, <tag_name>…
- ORDER BY <tag_name> <asc|desc>
- SLIMIT <group_limit>
- SOFFSET <group_offset>
- LIMIT <record_limit>
- OFFSET <record_offset>
-```
-
-**说明**：
-
-超级表聚合查询，TDengine目前支持以下聚合\选择函数：sum、count、avg、first、last、min、max、top、bottom，以及针对全部或部分列的投影操作，使用方式与单表查询的计算过程相同。暂不支持其他类型的聚合计算和四则运算。当前所有的函数及计算过程均不支持嵌套的方式进行执行。
-
- 不使用GROUP BY的查询将会对超级表下所有满足筛选条件的表按时间进行聚合，结果输出默认是按照时间戳单调递增输出，用户可以使用ORDER BY _c0 ASC|DESC选择查询结果时间戳的升降排序；使用GROUP BY <tag_name> 的聚合查询会按照tags进行分组，并对每个组内的数据分别进行聚合，输出结果为各个组的聚合结果，组间的排序可以由ORDER BY <tag_name> 语句指定，每个分组内部，时间序列是单调递增的。
-
-使用SLIMIT/SOFFSET语句指定组间分页，即指定结果集中输出的最大组数以及对组起始的位置。使用LIMIT/OFFSET语句指定组内分页，即指定结果集中每个组内最多输出多少条记录以及记录起始的位置。
-
-## STable使用示例
-
-以温度传感器采集时序数据作为例，示范STable的使用。 在这个例子中，对每个温度计都会建立一张表，表名为温度计的ID，温度计读数的时刻记为ts，采集的值记为degree。通过tags给每个采集器打上不同的标签，其中记录温度计的地区和类型，以方便我们后面的查询。所有温度计的采集量都一样，因此我们用STable来定义表结构。
-
-###定义STable表结构并使用它创建子表
-
-创建STable语句如下：
-
-```mysql
-CREATE TABLE thermometer (ts timestamp, degree double) 
-TAGS(location binary(20), type int)
-```
-
-假设有北京，天津和上海三个地区的采集器共4个，温度采集器有3种类型，我们就可以对每个采集器建表如下：
-
-```mysql
-CREATE TABLE therm1 USING thermometer TAGS (’beijing’, 1);
-CREATE TABLE therm2 USING thermometer TAGS (’beijing’, 2);
-CREATE TABLE therm3 USING thermometer TAGS (’tianjin’, 1);
-CREATE TABLE therm4 USING thermometer TAGS (’shanghai’, 3);
-```
-
-其中therm1，therm2，therm3，therm4是超级表thermometer四个具体的子表，也即普通的Table。以therm1为例，它表示采集器therm1的数据，表结构完全由thermometer定义，标签location=”beijing”, type=1表示therm1的地区是北京，类型是第1类的温度计。
-
-###写入数据
-
-注意，写入数据时不能直接对STable操作，而是要对每张子表进行操作。我们分别向四张表therm1，therm2， therm3， therm4写入一条数据，写入语句如下：
-
-```mysql
-INSERT INTO therm1 VALUES (’2018-01-01 00:00:00.000’, 20);
-INSERT INTO therm2 VALUES (’2018-01-01 00:00:00.000’, 21);
-INSERT INTO therm3 VALUES (’2018-01-01 00:00:00.000’, 24);
-INSERT INTO therm4 VALUES (’2018-01-01 00:00:00.000’, 23);
-```
-
-###按标签聚合查询
-
-查询位于北京(beijing)和天津(tianjing)两个地区的温度传感器采样值的数量count(*)、平均温度avg(degree)、最高温度max(degree)、最低温度min(degree)，并将结果按所处地域(location)和传感器类型(type)进行聚合。
-
-```mysql
-SELECT COUNT(*), AVG(degree), MAX(degree), MIN(degree)
-FROM thermometer
-WHERE location=’beijing’ or location=’tianjing’
-GROUP BY location, type 
-```
-
-###按时间周期聚合查询
-
-查询仅位于北京以外地区的温度传感器最近24小时(24h)采样值的数量count(*)、平均温度avg(degree)、最高温度max(degree)和最低温度min(degree)，将采集结果按照10分钟为周期进行聚合，并将结果按所处地域(location)和传感器类型(type)再次进行聚合。
-
-```mysql
-SELECT COUNT(*), AVG(degree), MAX(degree), MIN(degree)
-FROM thermometer
-WHERE name<>’beijing’ and ts>=now-1d
-INTERVAL(10M)
-GROUP BY location, type
-```
\ No newline at end of file
diff --git a/documentation20/webdocs/markdowndocs/Super Table.md b/documentation20/webdocs/markdowndocs/Super Table.md
deleted file mode 100644
index a213567f6d67ed351fac67b821f4db1929fa3a22..0000000000000000000000000000000000000000
--- a/documentation20/webdocs/markdowndocs/Super Table.md	
+++ /dev/null
@@ -1,195 +0,0 @@
-# STable: Super Table
-
-"One Table for One Device" design can improve the insert/query performance significantly for a single device. But it has a side effect, the aggregation of multiple tables becomes hard. To reduce the complexity and improve the efficiency, TDengine introduced a new concept: STable (Super Table).  
-
-## What is a Super Table
-
-STable is an abstract and a template for a type of device. A STable contains a set of devices (tables) that have the same schema or data structure. Besides the shared schema, a STable has a set of tags, like the model, serial number and so on. Tags are used to record the static attributes for the devices and are used to group a set of devices (tables) for aggregation. Tags are metadata of a table and can be added, deleted or changed.   
-
-TDengine does not save tags as a part of the data points collected. Instead, tags are saved as metadata. Each table has a set of tags. To improve query performance, tags are all cached and indexed. One table can only belong to one STable, but one STable may contain many tables. 
-
-Like a table, you can create, show, delete and describe STables. Most query operations on tables can be applied to STable too, including the aggregation and selector functions. For queries on a STable, if no tags filter, the operations are applied to all the tables created via this STable. If there is a tag filter, the operations are applied only to a subset of the tables which satisfy the tag filter conditions. It will be very convenient to use tags to put devices into different groups for aggregation.
-
-##Create a STable
-
-Similiar to creating a standard table, syntax is: 
-
-```mysql
-CREATE TABLE <stable_name> (<field_name> TIMESTAMP, field_name1 field_type,…) TAGS(tag_name tag_type, …)
-```
-
-New keyword "tags" is introduced, where tag_name is the tag name, and tag_type is the associated data type. 
-
-Note：
-
-1. The bytes of all tags together shall be less than 512 
-2. Tag's data type can not be time stamp or nchar
-3. Tag name shall be different from the field name
-4. Tag name shall not be the same as system keywords
-5. Maximum number of tags is 6 
-
-For example:
-
-```mysql
-create table thermometer (ts timestamp, degree float) 
-tags (location binary(20), type int)
-```
-
-The above statement creates a STable thermometer with two tag "location" and "type"
-
-##Create a Table via STable
-
-To create a table for a device, you can use a STable as its template and assign the tag values. The syntax is:
-
-```mysql
-CREATE TABLE <tb_name> USING <stb_name> TAGS (tag_value1,...)
-```
-
-You can create any number of tables via a STable, and each table may have different tag values. For example, you create five tables via STable thermometer below:
-
-```mysql
- create table t1 using thermometer tags (‘beijing’, 10);
- create table t2 using thermometer tags (‘beijing’, 20);
- create table t3 using thermometer tags (‘shanghai’, 10);
- create table t4 using thermometer tags (‘shanghai’, 20);
- create table t5 using thermometer tags (‘new york’, 10);
-```
-
-## Aggregate Tables via STable
-
-You can group a set of tables together by specifying the tags filter condition, then apply the aggregation operations. The result set can be grouped and ordered based on tag value. Syntax is：
-
-```mysql
-SELECT function<field_name>,… 
- FROM <stable_name> 
- WHERE <tag_name> <[=|<=|>=|<>] values..> ([AND|OR] …)
- INTERVAL (<time range>)
- GROUP BY <tag_name>, <tag_name>…
- ORDER BY <tag_name> <asc|desc>
- SLIMIT <group_limit>
- SOFFSET <group_offset>
- LIMIT <record_limit>
- OFFSET <record_offset>
-```
-
-For the time being, STable supports only the following aggregation/selection functions: *sum, count, avg, first, last, min, max, top, bottom*, and the projection operations, the same syntax as a standard table.  Arithmetic operations are not supported, embedded queries not either. 
-
-*INTERVAL* is used for the aggregation over a time range.
-
-If *GROUP BY* is not used, the aggregation is applied to all the selected tables, and the result set is output in ascending order of the timestamp, but you can use "*ORDER BY _c0 ASC|DESC*" to specify the order you like. 
-
-If *GROUP BY <tag_name>* is used, the aggregation is applied to groups based on tags. Each group is aggregated independently. Result set is a group of aggregation results. The group order is decided by *ORDER BY <tag_name>*. Inside each group, the result set is in the ascending order of the time stamp. 
-
-*SLIMIT/SOFFSET* are used to limit the number of groups and starting group number.
-
-*LIMIT/OFFSET* are used to limit the number of records in a group and the starting rows.
-
-###Example 1:
-
-Check the average, maximum, and minimum temperatures of Beijing and Shanghai, and group the result set by location and type. The SQL statement shall be:
-
-```mysql
-SELECT COUNT(*), AVG(degree), MAX(degree), MIN(degree)
-FROM thermometer
-WHERE location=’beijing’ or location=’tianjing’
-GROUP BY location, type 
-```
-
-### Example 2:
-
-List the number of records, average, maximum, and minimum temperature every 10 minutes for the past 24 hours for all the thermometers located in Beijing with type 10. The SQL statement shall be:
-
-```mysql
-SELECT COUNT(*), AVG(degree), MAX(degree), MIN(degree)
-FROM thermometer
-WHERE name=’beijing’ and type=10 and ts>=now-1d
-INTERVAL(10M)
-```
-
-## Create Table Automatically
-
-Insert operation will fail if the table is not created yet. But for STable, TDengine can create the table automatically if the application provides the STable name, table name and tags' value when inserting data points. The syntax is:
-
-```mysql
-INSERT INTO <tb_name> USING <stb_name> TAGS (<tag1_value>, ...) VALUES (field_value, ...) (field_value, ...) ... <tb_name2> USING <stb_name2> TAGS(<tag1_value2>, ...) VALUES (<field1_value1>, ...) ...;
-```
-
-When inserting data points into table tb_name, the system will check if table tb_name is created or not. If it is already created, the data points will be inserted as usual. But if the table is not created yet, the system will create the table tb_bame using STable stb_name as the template with the tags. Multiple tables can be specified in the SQL statement. 
-
-## Management of STables
-
-After you can create a STable, you can describe, delete, change STables. This section lists all the supported operations.
-
-### Show STables in current DB
-
-```mysql
-show stables;
-```
-
-It lists all STables in current DB, including the name, created time, number of fileds, number of tags, and number of tables which are created via this STable. 
-
-### Describe a STable
-
-```mysql
-DESCRIBE <stable_name>
-```
-
-It lists the STable's schema and tags
-
-### Drop a STable
-
-```mysql
-DROP TABLE <stable_name>
-```
-
-To delete a STable, all the tables created via this STable shall be deleted first, otherwise, it will fail.
-
-### List the Associated Tables of a STable
-
-```mysql
-SELECT TBNAME,[TAG_NAME,…] FROM <stable_name> WHERE <tag_name> <[=|=<|>=|<>] values..> ([AND|OR] …)
-```
-
-It will list all the tables which satisfy the tag filter conditions. The tables are all created from this specific STable. TBNAME is a new keyword introduced, it is the table name associated with the STable. 
-
-```mysql
-SELECT COUNT(TBNAME) FROM <stable_name> WHERE <tag_name> <[=|=<|>=|<>] values..> ([AND|OR] …)
-```
-
-The above SQL statement will list the number of tables in a STable, which satisfy the filter condition.
-
-## Management of Tags
-
-You can add, delete and change the tags for a STable, and you can change the tag value of a table. The SQL commands are listed below.  
-
-###Add a Tag
-
-```mysql
-ALTER TABLE <stable_name> ADD TAG <new_tag_name> <TYPE>
-```
-
-It adds a new tag to the STable with a data type. The maximum number of tags is 6. 
-
-###Drop a Tag
-
-```mysql
-ALTER TABLE <stable_name> DROP TAG <tag_name>
-```
-
-It drops a tag from a STable. The first tag could not be deleted, and there must be at least one tag.
-
-###Change a Tag's Name
-
-```mysql
-ALTER TABLE <stable_name> CHANGE TAG <old_tag_name> <new_tag_name>
-```
-
-It changes the name of a tag from old to new. 
-
-###Change the Tag's Value
-
-```mysql
-ALTER TABLE <table_name> SET TAG <tag_name>=<new_tag_value>
-```
-
-It changes a table's tag value to a new one. 
diff --git a/documentation20/webdocs/markdowndocs/TAOS SQL.md b/documentation20/webdocs/markdowndocs/TAOS SQL.md
deleted file mode 100644
index ae2d9d34a203de41d0deed523d16095c8830b452..0000000000000000000000000000000000000000
--- a/documentation20/webdocs/markdowndocs/TAOS SQL.md	
+++ /dev/null
@@ -1,636 +0,0 @@
-# TAOS SQL
-
-TDengine provides a SQL like query language to insert or query data. You can execute the SQL statements through the TDengine Shell, or through C/C++, Java(JDBC), Python, Restful, Go, and Node.js APIs to interact with the `taosd` service.
-
-Before reading through, please have a look at the conventions used for syntax descriptions here in this documentation.
-
-* Squared brackets ("[]") indicate optional arguments or clauses
-* Curly braces ("{}") indicate that one member from a set of choices in the braces must be chosen
-* A single verticle line ("|") works a separator for multiple optional args or clauses
-* Dots ("…") means repeating for as many times
-
-## Data Types
-
-### Timestamp
-
-The timestamp is the most important data type in TDengine. The first column of each table must be  **`TIMESTAMP`** type, but other columns can also be  **`TIMESTAMP`** type. The following rules for timestamp: 
-
-* String Format: `'YYYY-MM-DD HH:mm:ss.MS'`, which represents the year, month, day, hour, minute and second and milliseconds. For example,`'2017-08-12 18:52:58.128'` is a valid timestamp string. Note: timestamp string must be quoted by either single quote or double quote. 
-
-* Epoch Time:  a timestamp value can also be a long integer representing milliseconds since the epoch. For example, the values in the above example can be represented as an epoch `1502535178128` in milliseconds. Please note the epoch time doesn't need any quotes.
-
-* Internal Function **`NOW`** : this is the current time of the server
-* If timestamp is 0 when inserting a record, timestamp will be set to the current time of the server
-* Arithmetic operations can be applied to timestamp. For example: `now-2h` represents a timestamp which is 2 hours ago from the current server time. Units include `a` (milliseconds),  `s` (seconds),  `m` (minutes),  `h` (hours),  `d` (days),  `w` (weeks), `n` (months), `y` (years). **`NOW`** can be used in either insertions or queries. 
-
-Default time precision is millisecond, you can change it to microseocnd by setting parameter enableMicrosecond in [system configuration](../administrator/#Configuration-on-Server). For epoch time, the long integer shall be microseconds since the epoch. For the above string format, MS shall be six digits. 
-
-### Data Types
-
-The full list of data types is listed below.  For string types of data, we will use ***M*** to indicate the maximum length of that type.
-
-|      |  Data Type  |  Bytes  | Note                                                         |
-| ---- | :---------: | :-----: | ------------------------------------------------------------ |
-| 1    |   TINYINT   |    1    | A nullable integer type with a range of [-127, 127]​          |
-| 2    |  SMALLINT   |    2    | A nullable integer type with a range of [-32767, 32767]​      |
-| 3    |     INT     |    4    | A nullable integer type with a range of [-2^31+1, 2^31-1 ]   |
-| 4    |   BIGINT    |    8    | A nullable integer type with a range of [-2^59, 2^59 ]​       |
-| 5    |    FLOAT    |    4    | A standard nullable float type with 6 -7 significant digits and a range of [-3.4E38, 3.4E38] |
-| 6    |   DOUBLE    |    8    | A standard nullable double float type with 15-16 significant digits and a range of [-1.7E308, 1.7E308]​ |
-| 7    |    BOOL     |    1    | A nullable boolean type, [**`true`**, **`false`**]           |
-| 8    |  TIMESTAMP  |    8    | A nullable timestamp type with the same usage as the primary column timestamp |
-| 9    | BINARY(*M*) |   *M*   | A nullable string type whose length is *M*, error should be threw with exceeded chars, the maximum length of *M* is 16374, but as maximum row size is 16K bytes, the actual upper limit will generally less than 16374. This type of string only supports ASCii encoded chars. |
-| 10   | NCHAR(*M*)  | 4 * *M* | A nullable string type whose length is *M*, error should be threw with exceeded chars. The **`NCHAR`** type supports Unicode encoded chars. |
-
-All the keywords in a SQL statement are case-insensitive, but strings values are case-sensitive and must be quoted by a pair of `'` or `"`. To quote a `'` or a `"` , you can use the escape character `\`.
-
-## Database Management
-
-- **Create a Database**
-    ```mysql
-    CREATE DATABASE [IF NOT EXISTS] db_name [KEEP keep]
-    ```
-    Option: `KEEP` is used for data retention policy. The data records will be removed once keep-days are passed. There are more parameters related to DB storage, please check [system configuration](../administrator/#Configuration-on-Server).
-
-
-- **Use a Database**
-  
-    ```mysql
-    USE db_name
-    ```
-    Use or switch the current database.
-
-
-- **Drop a Database**
-    ```mysql
-    DROP DATABASE [IF EXISTS] db_name
-    ```
-    Remove a database, all the tables inside the DB will be removed too, be careful.
-
-
-- **List all Databases**
-  
-    ```mysql
-    SHOW DATABASES
-    ```
-
-
-## Table Management
-
-- **Create a Table**
-  
-    ```mysql
-    CREATE TABLE [IF NOT EXISTS] tb_name (timestamp_field_name TIMESTAMP, field1_name data_type1 [, field2_name data_type2 ...])
-    ```
-    Note: 
-    
-    1) The first column must be a `timestamp`, and the system will set it as the primary key. 
-    2) The maximum number of columns is 1024, the minimum number of columns is 2.
-    3) The maximum length: database name is 33, table nume is 193, column name is 65.    
-    4) The record size is limited to 16k bytes.
-    5) The total tag length is limited 16k bytes, the maximum number of tags is 128.
-    6) For `binary` or `nchar` data types, the length must be specified. For example, binary(20) means a binary data type with 20 bytes.
-
-
-- **Drop a Table**
-
-    ```mysql
-    DROP TABLE [IF EXISTS] tb_name
-    ```
-
-
-- **List all Tables **
-    ```mysql
-    SHOW TABLES [LIKE tb_name_wildcar]
-    ```
-    It shows all tables in the current DB. 
-    
-    Note: Wildcard characters can be used in the table name to filter tables. 
-    Wildcard characters: 
-    1) ’%’ means 0 to any number of characters. 
-    2）’_’ underscore means exactly one character.
-
-
-- **Print Table Schema**
-
-    ```mysql
-    DESCRIBE tb_name
-    ```
-
-
-- **Add a Column**
-
-    ```mysql
-    ALTER TABLE tb_name ADD COLUMN field_name data_type
-    ```
-
-
-- **Drop a Column**
-
-    ```mysql
-    ALTER TABLE tb_name DROP COLUMN field_name 
-    ```
-    If the table is created via [Super Table](), the schema can only be changed via STable. But for tables not created from STable, you can change their schema directly.
-
-**Tips**: You can apply an operation on a table not in the current DB by concatenating DB name with the character '.', then with the table name. For example, 'demo.tb1' means the operation is applied to table `tb1` in DB `demo` even though `demo` is not the currently selected DB.   
-
-## STable Management
-
-- **Create a STable**
-  
-    ```mysql
-    CREATE TABLE [IF NOT EXISTS] stb_name (timestamp_field_name TIMESTAMP, field1_name data_type1 [, field2_name data_type2 ...]) TAGS (tag1_name tag_type1, tag2_name tag_type2 [, tag3_name tag_type3])
-    ```
-    Create a STable is the same as you create a table, but the tag name and type shoudl be specified
-    Note: 
-    
-    1) The total tag length should not be exceeded 512 bytes
-    2) The type of tag cannot be timestamp
-    3) Tag name should not be the same as other column name or tag name
-    4) Tag name should not be any of Taos key words.
-
-
-- **Drop a STable**
-
-    ```mysql
-    DROP TABLE [IF EXISTS] tb_name
-    ```
-    Delete a STable will also delete all the tables created using the STable.
-
-
-- **List all STables**
-  
-    ```mysql
-    SHOW STABLES [LIKE tb_name_wildcar]
-    ```
-    It shows all STables in the current DB. 
-    
-    Note: Wildcard characters can be used in the table name to filter tables. 
-    Wildcard characters: 
-    1) ’%’ means 0 to any number of characters. 
-    2）’_’ underscore means exactly one character.
-
-
-- **Print STable Schema**
-
-    ```mysql
-    DESCRIBE stb_name
-    ```
-
-- **Add a Column**
-
-    ```mysql
-    ALTER TABLE stb_name ADD COLUMN field_name data_type
-    ```
-
-- **Drop a Column**
-
-    ```mysql
-    ALTER TABLE stb_name DROP COLUMN field_name 
-    ```
-    If the table is created via [Super Table](), the schema can only be changed via STable. But for tables not created from STable, you can change their schema directly.
-
-**Tips**: You can apply an operation on a table not in the current DB by concatenating DB name with the character '.', then with the table name. For example, 'demo.tb1' means the operation is applied to table `tb1` in DB `demo` even though `demo` is not the currently selected DB.
-
-## STable Tag Management
-
-- **Add a tag**
-  
-    ```mysql
-    ALTER TABLE stb_name ADD TAG new_tag_name tag_type
-    ```
-    Add a tag and specify tag type for STable. The total number of tags should be no more than 128.
-
-- **Drop a tag**
-
-    ```mysql
-    ALTER TABLE stb_name DROP TAG tag_name
-    ```
-    Delete a tag from STable, it will also delete the tag for the tables created using STable.
-
-
-- **Modify tag name**
-  
-    ```mysql
-    ALTER TABLE stb_name CHANGE TAG old_tag_name new_tag_name
-    ```
-    Modify a tag name for a STable, it will also modify the tag name for the tables created using STable.
-
-
-- **Change tag value**
-
-    ```mysql
-    ALTER TABLE tb_name SET TAG tag_name=new_tag_value
-    ```
-**Note**: 'Add a tag', 'Drop a tag', 'Modify tag name' used for STable, 'Change tag value' used for table. 
-
-
-## Inserting Records
-
-- **Insert a Record**
-    ```mysql
-    INSERT INTO tb_name VALUES (field_value, ...);
-    ```
-    Insert a data record into table tb_name
-
-
-- **Insert a Record with Selected Columns**
-  
-    ```mysql
-    INSERT INTO tb_name (field1_name, ...) VALUES(field1_value, ...)
-    ```
-    Insert a data record into table tb_name, with data in selected columns. If a column is not selected, the system will put NULL there. First column (time stamp ) cant not be null, it must be inserted.
-
-
-- **Insert a Batch of Records**
-  
-    ```mysql
-    INSERT INTO tb_name VALUES (field1_value1, ...) (field1_value2, ...)...;
-    ```
-    Insert multiple data records into the table
-
-
-- **Insert a Batch of Records with Selected Columns**
-  
-    ```mysql
-    INSERT INTO tb_name (field1_name, ...) VALUES(field1_value1, ...) (field1_value2, ...)
-    ```
-
-
-- **Insert Records into Multiple Tables**
-  
-    ```mysql
-    INSERT INTO tb1_name VALUES (field1_value1, ...)(field1_value2, ...)... 
-                tb2_name VALUES (field1_value1, ...)(field1_value2, ...)...;
-    ```
-    Insert data records into table tb1_name and tb2_name
-
-
-- **Insert Records into Multiple Tables with Selected Columns**
-  
-    ```mysql
-    INSERT INTO tb1_name (tb1_field1_name, ...) VALUES (field1_value1, ...) (field1_value1, ...)
-                tb2_name (tb2_field1_name, ...) VALUES(field1_value1, ...) (field1_value2, ...)
-    ```
-
-Note: 1. If the timestamp is 0, the time stamp will be set to the system time on the server.
-      2. The timestamp of the oldest record allowed to be inserted is relative to the current server time, minus the configured keep value (the number of days the data is retained), and the timestamp of the latest record allowed to be inserted is relative to the current server time, plus the configured days value (the time span in which the data file stores data, in days). Both keep and days can be specified when creating the database. The default values are 3650 days and 10 days, respectively.
- 
-**IMPORT**: If you do want to insert a historical data record into a table, use IMPORT command instead of INSERT. IMPORT has the same syntax as INSERT. 
-
-## Data Query
-
-###Query Syntax:
-
-```mysql
-SELECT select_expr [, select_expr ...]
-    FROM {tb_name_list}
-    [WHERE where_condition]
-    [INTERVAL [interval_offset,] interval_val]
-    [FILL fill_val]
-    [SLIDING fill_val]
-    [GROUP BY col_list]
-    [ORDER BY col_list { DESC | ASC }]
-    [HAVING expr_list]
-    [SLIMIT limit_val [, SOFFSET offset_val]]
-    [LIMIT limit_val [, OFFSET offset_val]]
-    [>> export_file]
-    
-SELECT function_list FROM tb_name
-    [WHERE where_condition]
-    [LIMIT limit [, OFFSET offset]]
-    [>> export_file]
-```
-
-- To query a table, use `*` to select all data from a table; or a specified list of expressions `expr_list` of columns. The SQL expression can contain alias and arithmetic operations between numeric typed columns.
-- For the `WHERE` conditions, use logical operations to filter the timestamp column and all numeric columns, and wild cards to filter the two string typed columns. 
-- Sort the result set by the first column timestamp `_c0` (or directly use the timestamp column name) in either descending or ascending order (by default). "Order by" could not be applied to other columns.
-- Use `LIMIT` and `OFFSET` to control the number of rows returned and the starting position of the retrieved rows. LIMIT/OFFSET is applied after "order by" operations.
-- Export the retrieved result set into a CSV file using `>>`. The target file's full path should be explicitly specified in the statement.
-
-###Supported Operations of Data Filtering:
-
-| Operation | Note                          | Applicable Data Types                 |
-| --------- | ----------------------------- | ------------------------------------- |
-| >         | larger than                   | **`timestamp`** and all numeric types |
-| <         | smaller than                  | **`timestamp`** and all numeric types |
-| >=        | larger than or equal to       | **`timestamp`** and all numeric types |
-| <=        | smaller than or equal to      | **`timestamp`** and all numeric types |
-| =         | equal to                      | all types                             |
-| <>        | not equal to                  | all types                             |
-| %         | match with any char sequences | **`binary`** **`nchar`**              |
-| _         | match with a single char      | **`binary`** **`nchar`**              |
-
-1. For two or more conditions, only AND is supported, OR is not supported yet.
-2. For filtering, only a single range is supported. For example, `value>20 and value<30` is a valid condition, but `value<20 AND value<>5` is an invalid condition
-
-### Some Examples 
-
-- For the examples below, table tb1 is created via the following statements
-
-    ```mysql
-    CREATE TABLE tb1 (ts timestamp, col1 int, col2 float, col3 binary(50))
-    ```
-
-- Query all the records in tb1 in the last hour:
-    ```mysql
-    SELECT * FROM tb1 WHERE ts >= NOW - 1h
-    ```
-
-
-- Query all the records in tb1 between 2018-06-01 08:00:00.000 and 2018-06-02 08:00:00.000, and filter out only the records whose col3 value ends with 'nny', and sort the records by their timestamp in a descending order:
-    ```mysql
-    SELECT * FROM tb1 WHERE ts > '2018-06-01 08:00:00.000' AND ts <= '2018-06-02 08:00:00.000' AND col3 LIKE '%nny' ORDER BY ts DESC
-    ```
-
-
-- Query the sum of col1 and col2 as alias 'complex_metric', and filter on the timestamp and col2 values. Limit the number of returned rows to 10, and offset the result by 5.
-    ```mysql
-    SELECT (col1 + col2) AS 'complex_metric' FROM tb1 WHERE ts > '2018-06-01 08:00:00.000' and col2 > 1.2 LIMIT 10 OFFSET 5
-    ```
-
-
-- Query the number of records in tb1 in the last 10 minutes, whose col2 value is larger than 3.14, and export the result to file `/home/testoutpu.csv`.
-    ```mysql
-    SELECT COUNT(*) FROM tb1 WHERE ts >= NOW - 10m AND col2 > 3.14 >> /home/testoutpu.csv
-    ```
-
-## SQL Functions
-
-### Aggregation Functions
-
-TDengine supports aggregations over numerical values, they are listed below:
-
-- **COUNT**
-
-    ```mysql
-    SELECT COUNT([*|field_name]) FROM tb_name [WHERE clause]
-    ```
-    Function: return the number of rows.  
-    Return Data Type: `integer`.  
-    Applicable Data Types: all.  
-    Applied to: table/STable.  
-    Note: 
-    
-    1) `*` can be used for all columns, as long as a column has non-NULL values, it will be counted.
-    
-    2) If it is on a specific column, only rows with non-NULL values will be counted 
-
-
-- **AVG**
-  
-    ```mysql
-    SELECT AVG(field_name) FROM tb_name [WHERE clause]
-    ```
-    Function: return the average value of a specific column.  
-    Return Data Type: `double`.  
-    Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`.  
-    Applied to: table/STable. 
-
-
-- **TWA**
-  
-    ```mysql
-    SELECT TWA(field_name) FROM tb_name WHERE clause
-    ```
-    Function: return the time-weighted average value of a specific column  
-    Return Data Type: `double`  
-    Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`  
-    Applied to: table/STable
-
-
-- **SUM**
-  
-    ```mysql
-    SELECT SUM(field_name) FROM tb_name [WHERE clause]
-    ```
-    Function: return the sum of a specific column.  
-    Return Data Type: `long integer` or `double`.  
-    Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`.  
-    Applied to: table/STable. 
-
-
-- **STDDEV**
-  
-    ```mysql
-    SELECT STDDEV(field_name) FROM tb_name [WHERE clause]
-    ```
-    Function: returns the standard deviation of a specific column.  
-    Return Data Type: double.  
-    Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`.  
-    Applied to: table. 
-
-
-- **LEASTSQUARES**
-    ```mysql
-    SELECT LEASTSQUARES(field_name, start_val, step_val) FROM tb_name [WHERE clause]
-    ```
-    Function: performs a linear fit to the primary timestamp and the specified column. 
-    Return Data Type: return a string of the coefficient and the interception of the fitted line.  
-    Applicable Data Types: all types except timestamp, binary, nchar, bool.  
-    Applied to: table.  
-    Note: The timestmap is taken as the independent variable while the specified column value is taken as the dependent variables.
-
-
-### Selector Functions
-
-- **MIN**
-  
-    ```mysql
-    SELECT MIN(field_name) FROM {tb_name | stb_name} [WHERE clause]
-    ```
-    Function: return the minimum value of a specific column.  
-    Return Data Type: the same data type.  
-    Applicable Data Types: all types except timestamp, binary, nchar, bool.  
-    Applied to: table/STable.  
-
-
-- **MAX**
-    ```mysql
-    SELECT MAX(field_name) FROM { tb_name | stb_name } [WHERE clause]
-    ```
-    Function: return the maximum value of a specific column.  
-    Return Data Type: the same data type.  
-    Applicable Data Types: all types except timestamp, binary, nchar, bool.  
-    Applied to: table/STable.    
-
-
-- **FIRST**
-  
-    ```mysql
-    SELECT FIRST(field_name) FROM { tb_name | stb_name } [WHERE clause]
-    ```
-    Function: return the first non-NULL value.  
-    Return Data Type: the same data type.  
-    Applicable Data Types: all types.  
-    Applied to: table/STable.  
-    Note: To return all columns, use first(*). 
-
-
-- **LAST**
-    ```mysql
-    SELECT LAST(field_name) FROM { tb_name | stb_name } [WHERE clause]
-    ```
-    Function: return the last non-NULL value.  
-    Return Data Type: the same data type.  
-    Applicable Data Types: all types.  
-    Applied to: table/STable.  
-    Note: To return all columns, use last(*). 
-
-
-- **TOP**
-  
-    ```mysql
-    SELECT TOP(field_name, K) FROM { tb_name | stb_name } [WHERE clause]
-    ```
-    Function: return the `k` largest values.  
-    Return Data Type: the same data type.  
-    Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`.  
-    Applied to: table/STable.  
-    Note: 
-    1) Valid range of `k`: 1≤*k*≤100
-    2) The associated `timestamp` will be returned too.  
-
-
-- **BOTTOM**
-  
-    ```mysql
-    SELECT BOTTOM(field_name, K) FROM { tb_name | stb_name } [WHERE clause]
-    ```
-    Function: return the `k` smallest values.  
-    Return Data Type: the same data type.  
-    Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`.  
-    Applied to: table/STable.  
-    Note: 
-    1) valid range of `k`: 1≤*k*≤100; 
-    2) The associated `timestamp` will be returned too. 
-
-
-- **PERCENTILE**
-    ```mysql
-    SELECT PERCENTILE(field_name, P) FROM { tb_name | stb_name } [WHERE clause]
-    ```
-    Function: the value of the specified column below which `P` percent of the data points fall.  
-    Return Data Type: double.  
-    Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`. 
-    Applied to: table/STable.  
-    Note: The range of `P` is `[0, 100]`. When `P=0` , `PERCENTILE` returns the equal value as `MIN`; when `P=100`, `PERCENTILE` returns the equal value as `MAX`. 
-
-- **APERCENTILE**
-    ```mysql
-    SELECT APERCENTILE(field_name, P) FROM { tb_name | stb_name } [WHERE clause]
-    ```
-    Function: the value of the specified column below which `P` percent of the data points fall, it returns approximate value of percentile.
-    Return Data Type: double.  
-    Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`. 
-    Applied to: table/STable.  
-    Note: The range of `P` is `[0, 100]`. When `P=0` , `APERCENTILE` returns the equal value as `MIN`; when `P=100`, `APERCENTILE` returns the equal value as `MAX`. `APERCENTILE` has a much better performance than `PERCENTILE`.
-
-- **LAST_ROW**
-    ```mysql
-    SELECT LAST_ROW(field_name) FROM { tb_name | stb_name } 
-    ```
-    Function: return the last row.  
-    Return Data Type: the same data type.  
-    Applicable Data Types: all types.  
-    Applied to: table/STable.  
-    Note: different from last, last_row returns the last row even if it has NULL values. 
-
-
-### Transformation Functions
-
-- **DIFF**
-    ```mysql
-    SELECT DIFF(field_name) FROM tb_name [WHERE clause]
-    ```
-    Function: return the difference between successive values of the specified column.  
-    Return Data Type: the same data type.  
-    Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`.  
-    Applied to: table. 
-
-
-- **SPREAD**
-    ```mysql
-    SELECT SPREAD(field_name) FROM { tb_name | stb_name } [WHERE clause]
-    ```
-    Function: return the difference between the maximum and the mimimum value.  
-    Return Data Type: double.  
-    Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`.  
-    Applied to: table/STable.  
-    Note: spread gives the range of data variation in a table/supertable; it is equivalent to `MAX()` - `MIN()`
-
-
-- **Arithmetic Operations**
-    ```mysql
-    SELECT field_name [+|-|*|/|%][Value|field_name] FROM { tb_name | stb_name }  [WHERE clause]
-    ```
-    Function: arithmetic operations on the selected columns.  
-    Return Data Type: double.  
-    Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`.
-    Applied to: table/STable.  
-    Note: 1) bracket can be used for operation priority; 2) If a column has NULL value, the result is NULL. 
-
-
-## Downsampling
-
-Time-series data are usually sampled by sensors at a very high frequency, but more often we are only interested in the downsampled, aggregated data of each timeline. TDengine provides a convenient way to downsample the highly frequently sampled data points as well as filling the missing data with a variety of interpolation choices.
-
-```mysql
-SELECT function_list FROM tb_name 
-  [WHERE where_condition]
-  INTERVAL (interval)
-  [FILL ({NONE | VALUE | PREV | NULL | LINEAR})]
-
-SELECT function_list FROM stb_name 
-  [WHERE where_condition]
-  INTERVAL (interval)
-  [FILL ({ VALUE | PREV | NULL | LINEAR})]
-  [GROUP BY tags]
-```
-
-The downsampling time window is defined by `interval`, which is at least 10 milliseconds. The query returns a new series of downsampled data that has a series of fixed timestamps with an increment of `interval`. 
-
-For the time being, only function count, avg, sum, stddev, leastsquares, percentile, min, max, first, last are supported. Functions that may return multiple rows are not supported. 
-
-You can also use `FILL` to interpolate the intervals that don't contain any data.`FILL` currently supports four different interpolation strategies which are listed below:
-
-| Interpolation                     | Usage                                                        |
-| --------------------------------- | ------------------------------------------------------------ |
-| `FILL(VALUE, val1 [, val2, ...])` | Interpolate with specified constants                         |
-| `FILL(PREV)`                      | Interpolate with the value at the previous timestamp         |
-| `FILL(LINEAR)`                    | Linear interpolation with the non-null values at the previous timestamp and at the next timestamp |
-| `FILL(NULL)`                      | Interpolate with **`NULL`** value                            |
-
- A few downsampling examples:
-
-- Find the number of data points, the maximum value of `col1` and minimum value of `col2` in a tb1 for every 10 minutes in the last 5 hours:
-    ```mysql
-    SELECT COUNT(*), MAX(col1), MIN(col2) FROM tb1 WHERE ts > NOW - 5h INTERVAL (10m)
-    ```
-
-
-- Fill the above downsampling results using constant-value interpolation:
-    ```mysql
-    SELECT COUNT(*), MAX(col1), MIN(col2) FROM tb1 WHERE ts > NOW - 5h INTERVAL(10m) FILL(VALUE, 0, 1, -1)
-    ```
-    Note that the number of constant values in `FILL()` should be equal or fewer than the number of functions in the `SELECT` clause. Exceeding fill constants will be ignored.
-
-
-- Fill the above downsampling results using `PREV` interpolation:
-    ```mysql
-    SELECT COUNT(*), MAX(col1), MIN(col2) FROM tb1 WHERE ts > NOW - 5h INTERVAL(10m) FILL(PREV)
-    ```
-    This will interpolate missing data points with the value at the previous timestamp.
-
-
-- Fill the above downsampling results using `NULL` interpolation:
-    ```mysql
-    SELECT COUNT(*), MAX(col1), MIN(col2) FROM tb1 WHERE ts > NOW - 5h INTERVAL(10m) FILL(NULL)
-    ```
-    Fill **`NULL`** to the interpolated data points.
-
-Notes:
-1. `FILL` can generate tons of interpolated data points if the interval is small and the queried time range is large. So always remember to specify a time range when using interpolation. For each query with interpolation, the result set can not exceed 10,000,000 records.
-2. The result set will always be sorted by time in ascending order.
-3. If the query object is a supertable, then all the functions will be applied to all the tables that qualify the `WHERE` conditions. If the `GROUP BY` clause is also applied, the result set will be sorted ascendingly by time in each single group, otherwise, the result set will be sorted ascendingly by time as a whole.
-
diff --git a/documentation20/webdocs/markdowndocs/administrator.md b/documentation20/webdocs/markdowndocs/administrator.md
deleted file mode 100644
index e118be525d117f0dc85f91c9fc3b66bf676ef30a..0000000000000000000000000000000000000000
--- a/documentation20/webdocs/markdowndocs/administrator.md
+++ /dev/null
@@ -1,231 +0,0 @@
-#Administrator
-
-## Directory and Files
-
-After TDengine is installed, by default, the following directories will be created:
-
-| Directory/File         | Description                     |
-| ---------------------- | :------------------------------ |
-| /etc/taos/taos.cfg     | TDengine configuration file     |
-| /usr/local/taos/driver | TDengine dynamic link library   |
-| /var/lib/taos          | TDengine default data directory |
-| /var/log/taos          | TDengine default log directory  |
-| /usr/local/taos/bin.   | TDengine executables            |
-
-### Executables
-
-All TDengine executables are located at _/usr/local/taos/bin_ , including:
-
-- `taosd`：TDengine server 
-- `taos`： TDengine Shell, the command line interface.
-- `taosdump`：TDengine data export tool
-- `rmtaos`： a script to uninstall TDengine
-
-You can change the data directory and log directory setting through the system configuration file
-
-## Configuration on Server
-
-`taosd` is running on the server side, you can change the system configuration file taos.cfg to customize its behavior. By default, taos.cfg is located at /etc/taos, but you can specify the path to configuration file via the command line parameter -c. For example: `taosd -c /home/user` means the configuration file will be read from directory /home/user.
-
-This section lists only the most important configuration parameters. Please check taos.cfg to find all the configurable parameters. **Note: to make your new configurations work, you have to restart taosd after you change taos.cfg**.
-
-- mgmtShellPort: TCP and UDP port between client and TDengine mgmt (default: 6030). Note: 5 successive UDP ports (6030-6034) starting from this number will be used.
-- vnodeShellPort: TCP and UDP port between client and TDengine vnode (default: 6035). Note: 5 successive UDP ports (6035-6039) starting from this number will be used.
-- httpPort: TCP port for RESTful service (default: 6020)
-- dataDir: data directory, default is /var/lib/taos
-- maxUsers: maximum number of users allowed
-- maxDbs: maximum number of databases allowed
-- maxTables: maximum number of tables allowed
-- enableMonitor: turn on/off system monitoring, 0: off, 1: on
-- logDir: log directory, default is /var/log/taos
-- numOfLogLines: maximum number of lines in the log file
-- debugFlag: log level, 131: only error and warnings, 135: all
-
-In different scenarios, data characteristics are different. For example, the retention policy, data sampling period, record size, the number of devices, and data compression may be different. To gain the best performance, you can change the following configurations related to storage:  
-
-- days: number of days to cover for a data file
-- keep: number of days to keep the data
-- rows: number of rows of records in a block in data file.
-- comp: compression algorithm, 0: off, 1: standard; 2: maximum compression
-- ctime: period (seconds) to flush data to disk
-- clog: flag to turn on/off Write Ahead Log, 0: off, 1: on 
-- tables: maximum number of tables allowed in a vnode
-- cache: cache block size (bytes)
-- tblocks: maximum number of cache blocks for a table
-- abloks: average number of cache blocks for a table 
-- precision: timestamp precision, us: microsecond ms: millisecond, default is ms
-
-For an application, there may be multiple data scenarios. The best design is to put all data with the same characteristics into one database. One application may have multiple databases, and every database has its own configuration to maximize the system performance. You can specify the above configurations related to storage when you create a database. For example:  
-
-```mysql
-CREATE DATABASE demo DAYS 10 CACHE 16000 ROWS 2000 
-```
-
-The above SQL statement will create a database demo, with 10 days for each data file, 16000 bytes for a cache block, and 2000 rows in a file block.
-
-The configuration provided when creating a database will overwrite the configuration in taos.cfg. 
-
-## Configuration on Client 
-
-*taos* is the TDengine shell and is a client that connects to taosd. TDengine uses the same configuration file taos.cfg for the client, with default location at /etc/taos. You can change it by specifying command line parameter -c when you run taos. For example, *taos -c /home/user*, it will read the configuration file taos.cfg from directory /home/user.
-
-The parameters related to client configuration are listed below: 
-
-- masterIP: IP address of TDengine server
-- charset: character set, default is the system . For data type nchar, TDengine uses unicode to store the data. Thus, the client needs to tell its character set.
-- locale: system language setting
-- defaultUser: default login user, default is root
-- defaultPass: default password, default is taosdata
-
-For TCP/UDP port, and system debug/log configuration, it is the same as the server side.
-
-For server IP, user name, password, you can always specify them in the command line when you run taos. If they are not specified, they will be read from the taos.cfg
-
-## User Management
-
-System administrator (user root) can add, remove a user, or change the password from the TDengine shell. Commands are listed below:
-
-Create a user, password shall be quoted with the single quote.
-
-```mysql
-CREATE USER user_name PASS ‘password’
-```
-
-Remove a user
-
-```mysql
-DROP USER user_name
-```
-
-Change the password for a user
-
-```mysql
-ALTER USER user_name PASS ‘password’  
-```
-
-List all users
-
-```mysql
-SHOW USERS
-```
-
-## Import Data
-
-Inside the TDengine shell, you can import data into TDengine from either a script or CSV file
-
-**Import from Script**
-
-```
-source <filename>
-```
-
-Inside the file, you can put all SQL statements there. Each SQL statement has a line. If a line starts with "#", it means comments, it will be skipped. The system will execute the SQL statements line by line automatically until the ends 
-
-**Import from CSV**
-
-```mysql
-insert into tb1 file 'path/data.csv'
-```
-
-CSV file contains records for only one table, and the data structure shall be the same as the defined schema for the table. The header of CSV file shall be removed. 
-
-For example, the following is a sub-table d1001:
-
-```mysql
-taos> DESCRIBE d1001
-             Field              |        Type        |   Length    |    Note    |
-=================================================================================
- ts                             | TIMESTAMP          |           8 |            |
- current                        | FLOAT              |           4 |            |
- voltage                        | INT                |           4 |            |
- phase                          | FLOAT              |           4 |            |
- location                       | BINARY             |          64 | TAG        |
- groupid                        | INT                |           4 | TAG        |
-```
-The data format in data.csv like this：
-
-```csv
-'2018-10-04 06:38:05.000',10.30000,219,0.31000
-'2018-10-05 06:38:15.000',12.60000,218,0.33000
-'2018-10-06 06:38:16.800',13.30000,221,0.32000
-'2018-10-07 06:38:05.000',13.30000,219,0.33000
-'2018-10-08 06:38:05.000',14.30000,219,0.34000
-'2018-10-09 06:38:05.000',15.30000,219,0.35000
-'2018-10-10 06:38:05.000',16.30000,219,0.31000
-'2018-10-11 06:38:05.000',17.30000,219,0.32000
-'2018-10-12 06:38:05.000',18.30000,219,0.31000
-```
-then data can be imported into database by this cmd:
-
-```
-taos> insert into d1001 file '~/data.csv';
-Query OK, 9 row(s) affected (0.004763s)
-```
-## Export Data
-
-You can export data either from TDengine shell or from tool taosdump.
-
-**Export from TDengine Shell**
-
-```mysql
-select * from <tb_name> >> data.csv
-```
-
-The above SQL statement will dump the query result set into data.csv file.  
-
-**Export Using taosdump**
-
-TDengine provides a data dumping tool taosdump. You can choose to dump a database, a table, all data or data only a time range, even only the metadata. For example:
-
-- Export one or more tables in a DB: taosdump [OPTION…] dbname tbname …
-- Export one or more DBs: taosdump [OPTION…] --databases dbname…
-- Export all DBs (excluding system DB): taosdump [OPTION…] --all-databases
-
-run *taosdump —help* to get a full list of the options
-
-## Management of Connections, Streams, Queries 
-
-The system administrator can check, kill the ongoing connections, streams, or queries. 
-
-```
-SHOW CONNECTIONS
-```
-
-It lists all connections. The first column shows connection-id from the client. 
-
-```
-KILL CONNECTION <connection-id>
-```
-
-It kills the connection, where connection-id is the number of the first column showed by "SHOW CONNECTIONS".
-
-```
-SHOW QUERIES
-```
-
-It shows the ongoing queries. The first column shows the connection-id:query-no, where connection-id is the connection from the client, and id assigned by the system
-
-```
-KILL QUERY <query-id>
-```
-
-It kills the query, where query-id is the connection-id:query-no showed by "SHOW QUERIES". You can copy and paste it.
-
-```
-SHOW STREAMS
-```
-
-It shows the continuous queries. The first column shows the connection-id:stream-no, where connection-id is the connection from the client, and id assigned by the system.
-
-```
-KILL STREAM <stream-id>
-```
-
-It kills the continuous query, where stream-id is the connection-id:stream-no showed by "SHOW STREAMS". You can copy and paste it.
-
-## System Monitor
-
-TDengine runs a system monitor in the background. Once it is started, it will create a database sys automatically. System monitor collects the metric like CPU, memory, network, disk, number of requests periodically, and writes them into database sys. Also, TDengine will log all important actions, like login, logout, create database, drop database and so on, and write them into database sys. 
-
-You can check all the saved monitor information from database sys. By default, system monitor is turned on. But you can turn it off by changing the parameter in the configuration file.
-
diff --git a/documentation20/webdocs/markdowndocs/advanced features.md b/documentation20/webdocs/markdowndocs/advanced features.md
deleted file mode 100644
index 05f6da5ed9e94684e7d39f086d850805eb966b85..0000000000000000000000000000000000000000
--- a/documentation20/webdocs/markdowndocs/advanced features.md	
+++ /dev/null
@@ -1,80 +0,0 @@
-#Advanced Features
-
-##Continuous Query
-Continuous Query is a query executed by TDengine periodically with a sliding window, it is a simplified stream computing driven by timers, not by events. Continuous query can be applied to a table or a STable, and the result set can be passed to the application directly via call back function, or written into a new table in TDengine. The query is always executed on a specified time window (window size is specified by parameter interval), and this window slides forward while time flows (the sliding period is specified by parameter sliding).    
-
-Continuous query is defined by TAOS SQL, there is nothing special. One of the best applications is downsampling. Once it is defined, at the end of each cycle, the system will execute the query, pass the result to the application or write it to a database. 
-
-If historical data pints are inserted into the stream, the query won't be re-executed, and the result set won't be updated. If the result set is passed to the application, the application needs to keep the status of continuous query, the server won't maintain it. If application re-starts, it needs to decide the time where the stream computing shall be started.
-
-####How to use continuous query
-
- 
-
-  - Pass result set to application
-
-    Application shall use API taos_stream (details in connector section) to start the stream computing. Inside the API, the SQL syntax is:
-  
-    ```sql
-    SELECT aggregation FROM [table_name | stable_name] 
-    INTERVAL(window_size) SLIDING(period)
-    ```
-  
-    where the new keyword INTERVAL specifies the window size, and SLIDING specifies the sliding period. If parameter sliding is not specified, the sliding period will be the same as window size. The minimum window size is 10ms. The sliding period shall not be larger than the window size. If you set a value larger than the window size, the system will adjust it to window size automatically.
-  
-    For example:
-  
-    ```sql
-    SELECT COUNT(*) FROM FOO_TABLE 
-    INTERVAL(1M) SLIDING(30S)
-    ```
-  
-    The above SQL statement will count the number of records for the past 1-minute window every 30 seconds.
-  
-  - Save the result into a database
-  
-    If you want to save the result set of stream computing into a new table, the SQL shall be: 
-  
-    ```sql
-    CREATE TABLE table_name AS 
-    SELECT aggregation from [table_name | stable_name]  
-    INTERVAL(window_size) SLIDING(period)
-    ```
-  
-    Also, you can set the time range to execute the continuous query. If no range is specified, the continuous query will be executed forever. For example, the following continuous query will be executed from now and will stop in one hour.
-  
-    ```sql
-    CREATE TABLE QUERY_RES AS 
-    SELECT COUNT(*) FROM FOO_TABLE 
-    WHERE TS > NOW AND TS <= NOW + 1H 
-    INTERVAL(1M) SLIDING(30S) 
-    ```
-
-###Manage the Continuous Query
-
-Inside TDengine shell, you can use the command "show streams" to list the ongoing continuous queries, the command "kill stream" to kill a specific continuous query. 
-
-If you drop a table generated by the continuous query, the query will be removed too.
-
-##Publisher/Subscriber
-
-Time series data is a sequence of data points over time. Inside a table, the data points are stored in order of timestamp. Also, there is a data retention policy, the data points will be removed once their lifetime is passed. From another view, a table in DTengine is just a standard message queue. 
-
-To reduce the development complexity and improve data consistency, TDengine provides the pub/sub functionality. To publish a message, you simply insert a record into a table. Compared with popular messaging tool Kafka, you subscribe to a table or a SQL query statement, instead of a topic. Once new data points arrive, TDengine will notify the application. The process is just like Kafka.  
-
-The detailed API will be introduced in the [connectors](https://www.taosdata.com/en/documentation/advanced-features/) section. 
-
-##Caching
-TDengine allocates a fixed-size buffer in memory, the newly arrived data will be written into the buffer first. Every device or table gets one or more memory blocks. For typical IoT scenarios, the hot data shall always be newly arrived data, they are more important for timely analysis. Based on this observation, TDengine manages the cache blocks in First-In-First-Out strategy. If no enough space in the buffer, the oldest data will be saved into hard disk first, then be overwritten by newly arrived data. TDengine also guarantees every device can keep at least one block of data in the buffer. 
-
-By this design, the application can retrieve the latest data from each device super-fast, since they are all available in memory. You can use last or last_row function to return the last data record. If the super table is used, it can be used to return the last data records of all or a subset of devices. For example, to retrieve the latest temperature from thermometers in located Beijing, execute the following SQL  
-
-```mysql
-select last(*) from thermometers where location=’beijing’
-```
-
-By this design, caching tool, like Redis, is not needed in the system. It will reduce the complexity of the system. 
-
-TDengine creates one or more virtual nodes(vnode) in each data node. Each vnode contains data for multiple tables and has its own buffer. The buffer of a vnode is fully separated from the buffer of another vnode, not shared. But the tables in a vnode share the same buffer.  
-
-System configuration parameter cacheBlockSize configures the cache block size in bytes, and another parameter cacheNumOfBlocks configures the number of cache blocks. The total memory for the buffer of a vnode is $cacheBlockSize \times cacheNumOfBlocks$. Another system parameter numOfBlocksPerMeter configures the maximum number of cache blocks a table can use. When you create a database, you can specify these parameters. 
\ No newline at end of file
diff --git a/documentation20/webdocs/markdowndocs/architecture.md b/documentation20/webdocs/markdowndocs/architecture.md
deleted file mode 100644
index 3a91f1e8dc24314f66acf906e69d3dcd0df8e370..0000000000000000000000000000000000000000
--- a/documentation20/webdocs/markdowndocs/architecture.md
+++ /dev/null
@@ -1,101 +0,0 @@
-# Data Model and Architecture
-## Data Model
-
-### A Typical IoT Scenario 
-
-In a typical IoT scenario, there are many types of devices. Each device is collecting one or multiple metrics. For a specific type of device, the collected data looks like the table below: 
-
-| Device ID |  Time Stamp   | Value 1 | Value 2 | Value 3 | Tag 1 | Tag 2 |
-| :-------: | :-----------: | :-----: | :-----: | :-----: | :---: | :---: |
-|   D1001   | 1538548685000 |  10.3   |   219   |  0.31   |  Red  | Tesla |
-|   D1002   | 1538548684000 |  10.2   |   220   |  0.23   | Blue  |  BMW  |
-|   D1003   | 1538548686500 |  11.5   |   221   |  0.35   | Black | Honda |
-|   D1004   | 1538548685500 |  13.4   |   223   |  0.29   |  Red  | Volvo |
-|   D1001   | 1538548695000 |  12.6   |   218   |  0.33   |  Red  | Tesla |
-|   D1004   | 1538548696600 |  11.8   |   221   |  0.28   | Black | Honda |
-
-Each data record has device ID, timestamp, the collected metrics, and static tags associated with the device. Each device generates a data record in a pre-defined timer or triggered by an event. It is a sequence of data points, like a stream. 
-
-### Data Characteristics
-
-Being a series of data points over time, data points generated by devices, sensors, servers, or applications have strong common characteristics. 
-
-1. metric is always structured data; 
-2. there are rarely delete/update operations on collected data; 
-3. there is only one single data source for one device or sensor; 
-4. ratio of read/write is much lower than typical Internet application; 
-5. the user pays attention to the trend of data, not the specific value at a specific time; 
-6. there is always a data retention policy; 
-7. the data query is always executed in a given time range and a subset of devices; 
-8. real-time aggregation or analytics is mandatory; 
-9. traffic is predictable based on the number of devices and sampling frequency; 
-10. data volume is huge, a system may generate 10 billion data points in a day.    
-
-By utilizing the above characteristics, TDengine designs the storage and computing engine in a special and optimized way for time-series data. The system efficiency is improved significantly.    
-
-### Relational Database Model 
-
-Since time-series data is more likely to be structured data, TDengine adopts the traditional relational database model to process them. You need to create a database, create tables with schema definition, then insert data points and execute queries to explore the data. Standard SQL is used, there is no learning curve. 
-
-### One Table for One Device
-
-Due to different network latency, the data points from different devices may arrive at the server out of order. But for the same device, data points will arrive at the server in order if system is designed well. To utilize this special feature, TDengine requires the user to create a table for each device (time-stream). For example, if there are over 10,000 smart meters, 10,000 tables shall be created. For the table above, 4 tables shall be created for device D1001, D1002, D1003 and D1004, to store the data collected. 
-
-This strong requirement can guarantee the data points from a device can be saved in a continuous memory/hard disk space block by block. If queries are applied only on one device in a time range, this design will reduce the read latency significantly since a whole block is owned by one single device. Also, write latency can be significantly reduced too, since the data points generated by the same device will arrive in order, the new data point will be simply appended to a block. Cache block size and the rows of records in a file block can be configured to fit the scenarios.
-
-### Best Practices
-
-**Table**: TDengine suggests to use device ID as the table name (like D1001 in the above diagram). Each device may collect one or more metrics (like value1, valu2, valu3 in the diagram). Each metric has a column in the table, the metric name can be used as the column name. The data type for a column can be int, float, double, tinyint, bigint, bool or binary. Sometimes, a device may have multiple metric group, each group have different sampling period, you shall create a table for each group for each device. The first column in the table must be time stamp. TDengine uses time stamp as the index, and won’t build the index on any metrics stored.
-
-**Tags:** to support aggregation over multiple tables efficiently, [STable(Super Table)](../super-table) concept is introduced by TDengine. A STable is used to represent the same type of device. The schema is used to define the collected metrics(like value1, value2, value3 in the diagram), and tags are used to define the static attributes for each table or device(like tag1, tag2 in the diagram). A table is created via STable with a specific tag value. All or a subset of tables in a STable can be aggregated by filtering tag values.  
-
-**Database:** different types of devices may generate data points in different patterns and shall be processed differently. For example, sampling frequency, data retention policy, replication number, cache size, record size, the compression algorithm may be different. To make the system more efficient, TDengine suggests creating a different database with unique configurations for different scenarios 
-
-**Schemaless vs Schema:** compared with NoSQL database, since a table with schema definition shall be created before the data points can be inserted, flexibilities are not that good, especially when the schema is changed. But in most IoT scenarios, the schema is well defined and is rarely changed, the loss of flexibilities won’t be a big pain to developers or the administrator. TDengine allows the application to change the schema in a second even there is a huge amount of historical data when schema has to be changed. 
-
-TDengine does not impose a limitation on the number of tables, [STables](../super-table), or databases. You can create any number of STable or databases to fit the scenarios.   
-
-## Architecture
-
-There are two main modules in TDengine server as shown in Picture 1: **Management Module (MGMT)** and **Data Module(DNODE)**. The whole TDengine architecture also includes a **TDengine Client Module**.
-
-<center> <img src="../assets/structure.png"> </center>
-<center> Picture 1 TDengine Architecture  </center>
-### MGMT Module
-The MGMT module deals with the storage and querying on metadata, which includes information about users, databases, and tables. Applications will connect to the MGMT module at first when connecting the TDengine server. When creating/dropping databases/tables, The request is sent to the MGMT module at first to create/delete metadata. Then the MGMT module will send requests to the data module to allocate/free resources required. In the case of writing or querying, applications still need to visit MGMT module to get meta data, according to which, then access the DNODE module.
-
-### DNODE Module
-The DNODE module is responsible for storing and querying data. For the sake of future scaling and high-efficient resource usage, TDengine applies virtualization on resources it uses. TDengine introduces the concept of virtual node (vnode), which is the unit of storage, resource allocation and data replication (enterprise edition). As is shown in Picture 2, TDengine treats each data node as an aggregation of vnodes. 
-
-When a DB is created, the system will allocate a vnode. Each vnode contains multiple tables, but a table belongs to only one vnode. Each DB has one or mode vnodes, but one vnode belongs to only one DB. Each vnode contains all the data in a set of tables. Vnodes have their own cache, directory to store data. Resources between different vnodes are exclusive with each other, no matter cache or file directory. However, resources in the same vnode are shared between all the tables in it. By virtualization, TDengine can distribute resources reasonably to each vnode and improve resource usage and concurrency. The number of vnodes on a dnode is configurable according to its hardware resources.
-
-<center> <img src="../assets/vnode.png">  </center>
-<center> Picture 2 TDengine Virtualization  </center> 
-
-### Client Module
-TDengine client module accepts requests (mainly in SQL form) from applications and converts the requests to internal representations and sends to the server side. TDengine supports multiple interfaces, which are all built on top of TDengine client module. 
-
-For the communication between client and MGMT module, TCP/UDP is used, the port is set by the parameter mgmtShellPort in system configuration file taos.cfg, default is 6030. For the communication between client and DNODE module, TCP/UDP is used, the port is set by the parameter vnodeShellPort in the system configuration file, default is 6035. 
-
-## Writing Process
-Picture 3 shows the full writing process of TDengine. TDengine uses [Writing Ahead Log] (WAL) strategy to assure data security and integrity. Data received from the client is written to the commit log at first. When TDengine recovers from crashes caused by power lose or other situations, the commit log is used to recover data. After writting to commit log, data will be wrtten to the corresponding vnode cache, then an acknowledgment is sent to the application. There are two mechanisms that can flush data in cache to disk for persistent storage:
-
-1. **Flush driven by timer**: There is a backend timer which flushes data in cache periodically to disks. The period is configurable via parameter commitTime in system configuration file taos.cfg.
-2. **Flush driven by data**: Data in the cache is also flushed to disks when the left buffer size is below a threshold. Flush driven by data can reset the timer of flush driven by the timer.
-
-<center> <img src="../assets/write_process.png">  </center>
-<center> Picture 3 TDengine Writting Process  </center>
-
-New commit log file will be opened when the committing process begins. When the committing process finishes, the old commit file will be removed.
-
-## Data Storage
-
-TDengine data are saved in _/var/lib/taos_ directory by default. It can be changed to other directories by setting the parameter dataDir in system configuration file taos.cfg.
-
-TDengine's metadata includes the database, table, user, super table and tag information. To reduce the latency, metadata are all buffered in the cache.
-
-Data records saved in tables are sharded according to the time range. Data of tables in the same vnode in a certain time range are saved in the same file group. This sharding strategy can effectively improve data searching speed. By default, one group of files contain data in 10 days, which can be configured by *daysPerFile* in the configuration file or by *DAYS* keyword in *CREATE DATABASE* clause. 
-
-Data records are removed automatically once their lifetime is passed. The lifetime is configurable via parameter daysToKeep in the system configuration file. The default value is 3650 days. 
-
-Data in files are blockwise. A data block only contains one table's data. Records in the same data block are sorted according to the primary timestamp. To improve the compression ratio, records are stored column by column, and the different compression algorithm is applied based on each column's data type. 
\ No newline at end of file
diff --git a/documentation20/webdocs/markdowndocs/faq.md b/documentation20/webdocs/markdowndocs/faq.md
deleted file mode 100644
index ce7d2ebf5e390d616d47835af5f958af1223ea59..0000000000000000000000000000000000000000
--- a/documentation20/webdocs/markdowndocs/faq.md
+++ /dev/null
@@ -1,46 +0,0 @@
-#FAQ
-
-#### 1. How to upgrade TDengine from 1.X versions to 2.X and above versions?
-
-Version 2.X is a complete refactoring of the previous version, and configuration files and data files are incompatible. Be sure to do the following before upgrading:
-
-1. Delete the configuration file, and execute <code>sudo rm -rf /etc/taos/taos</code>
-2. Delete the log file, and execute <code>sudo rm -rf /var/log/taos </code>
-3. ENSURE THAT YOUR DATAS ARE NO LONGER NEEDED! Delete the data file, and execute <code>sudo rm -rf /var/lib/taos </code>
-4. Enjoy the latest stable version of TDengine
-5. If the data needs to be migrated or the data file is corrupted, please contact the official technical support team for assistance
-
-#### 2. When encoutered with the error "Unable to establish connection", what can I do?
-
-The client may encounter connection errors. Please follow the steps below for troubleshooting:
-
-1. Make sure that the client and server version Numbers are exactly the same, and that the open source community and Enterprise versions are not mixed.
-2. On the server side, execute `systemctl status taosd` to check the status of *taosd* service. If *taosd* is not running, start it and retry connecting.
-3. Make sure you have used the correct server IP address to connect to.
-4. Ping the server. If no response is received, check your network connection.
-5. Check the firewall setting, make sure the TCP/UDP ports from 6030-6039 are enabled.
-6. For JDBC, ODBC, Python, Go connections on Linux, make sure the native library *libtaos.so* are located at /usr/local/lib/taos, and /usr/local/lib/taos is in the *LD_LIBRARY_PATH*. 
-7. For JDBC, ODBC, Python, Go connections on Windows, make sure *driver/c/taos.dll* is in the system search path (or you can copy taos.dll into *C:\Windows\System32*)
-8. If the above steps can not help, try the network diagnostic tool *nc* to check if TCP/UDP port works
-      check UDP port：`nc -vuz {hostIP} {port} `
-      check TCP port on server:  `nc -l {port}`
-      check TCP port on client: ` nc {hostIP} {port}`
-
-#### 3. Why I get "Invalid SQL" error when a query is syntactically correct?
-
-If you are sure your query has correct syntax, please check the length of the SQL string. Before version 2.0, it shall be less than 64KB. 
-
-#### 4. Does TDengine support validation queries?
-
-For the time being, TDengine does not have a specific set of validation queries. However, TDengine comes with a system monitoring database named 'sys', which can usually be used as a validation query object. 
-
-#### 5. Can I delete or update a record that has been written into TDengine?
-
-The answer is NO. The design of TDengine is based on the assumption that records are generated by the connected devices, you won't be allowed to change it. But TDengine provides a retention policy, the data records will be removed once their lifetime is passed.
-
-#### 6. What is the most efficient way to write data to TDengine?
-
-TDengine supports several different writing regimes. The most efficient way to write data to TDengine is to use batch inserting. For details on batch insertion syntax, please refer to [Taos SQL](../documentation/taos-sql)
-
-
-
diff --git a/src/balance/src/bnMain.c b/src/balance/src/bnMain.c
index 3055f77e81021c4877d97147033fc34f4c525df9..67741b147328cca844b796399d599a7ad92c8a7b 100644
--- a/src/balance/src/bnMain.c
+++ b/src/balance/src/bnMain.c
@@ -220,10 +220,6 @@ int32_t bnAllocVnodes(SVgObj *pVgroup) {
 }
 
 static bool bnCheckVgroupReady(SVgObj *pVgroup, SVnodeGid *pRmVnode) {
-  if (pVgroup->lbTime + 5 * tsStatusInterval > tsAccessSquence) {
-    return false;
-  }
-
   int32_t rmVnodeVer = 0;
   for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
     SVnodeGid *pVnode = pVgroup->vnodeGid + i;
@@ -405,7 +401,7 @@ void bnReset() {
     if (pDnode == NULL) break;
 
     // while master change, should reset dnode to offline
-    mInfo("dnode:%d set access:%d to 0", pDnode->dnodeId, pDnode->lastAccess);
+    mInfo("dnode:%d set access:%" PRId64 " to 0", pDnode->dnodeId, pDnode->lastAccess);
     pDnode->lastAccess = 0;
     if (pDnode->status != TAOS_DN_STATUS_DROPPING) {
       pDnode->status = TAOS_DN_STATUS_OFFLINE;
@@ -499,7 +495,7 @@ static bool bnMontiorDropping() {
       if (dnodeIsMasterEp(pDnode->dnodeEp)) continue; 
       if (mnodeGetDnodesNum() <= 1) continue;
 
-      mLInfo("dnode:%d, set to removing state for it offline:%d seconds", pDnode->dnodeId,
+      mLInfo("dnode:%d, set to removing state for it offline:%" PRId64 " seconds", pDnode->dnodeId,
               tsAccessSquence - pDnode->lastAccess);
 
       pDnode->status = TAOS_DN_STATUS_DROPPING;
@@ -574,8 +570,8 @@ void bnCheckStatus() {
       if (pDnode->status != TAOS_DN_STATUS_DROPPING && pDnode->status != TAOS_DN_STATUS_OFFLINE) {
         pDnode->status = TAOS_DN_STATUS_OFFLINE;
         pDnode->offlineReason = TAOS_DN_OFF_STATUS_MSG_TIMEOUT;
-        mInfo("dnode:%d, set to offline state, access seq:%d last seq:%d laststat:%d", pDnode->dnodeId, tsAccessSquence,
-              pDnode->lastAccess, pDnode->status);
+        mInfo("dnode:%d, set to offline state, access seq:%" PRId64 " last seq:%" PRId64 " laststat:%d", pDnode->dnodeId,
+              tsAccessSquence, pDnode->lastAccess, pDnode->status);
         bnSetVgroupOffline(pDnode);
         bnStartTimer(3000);
       }
diff --git a/src/balance/src/bnThread.c b/src/balance/src/bnThread.c
index d07591ecd55a9a10613cc61de3a77ea85e022bc2..44cb24effa09688db79bb9ae8fa40a381c0c0404 100644
--- a/src/balance/src/bnThread.c
+++ b/src/balance/src/bnThread.c
@@ -102,12 +102,12 @@ static void bnProcessTimer(void *handle, void *tmrId) {
   if (tsBnThread.stop) return;
 
   tsBnThread.timer = NULL;
-  tsAccessSquence++;
-
   bnStartTimer(-1);
   bnCheckStatus();
 
   if (handle == NULL) {
+    ++tsAccessSquence;
+
     if (tsAccessSquence % tsBalanceInterval == 0) {
       mDebug("balance function is scheduled by timer");
       bnPostSignal();
@@ -122,8 +122,7 @@ static void bnProcessTimer(void *handle, void *tmrId) {
 void bnStartTimer(int32_t mseconds) {
   if (tsBnThread.stop) return;
 
-  bool updateSoon = (mseconds != -1);
-  if (updateSoon) {
+  if (mseconds != -1) {
     mTrace("balance function will be called after %d ms", mseconds);
     taosTmrReset(bnProcessTimer, mseconds, (void *)(int64_t)mseconds, tsMnodeTmr, &tsBnThread.timer);
   } else {
@@ -132,5 +131,5 @@ void bnStartTimer(int32_t mseconds) {
 }
 
 void bnNotify() {
-  bnStartTimer(500); 
+  bnStartTimer(500);
 }
diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h
index 5a0dcf6208be2b95268dd2df2d83bc185d96fde5..ec4bf5252783cd9df31d820bff1277fb2ba25afb 100644
--- a/src/client/inc/tsclient.h
+++ b/src/client/inc/tsclient.h
@@ -266,6 +266,7 @@ typedef struct SSqlObj {
 
 typedef struct SSqlStream {
   SSqlObj *pSql;
+  void *  cqhandle;  // stream belong to SCQContext handle
   const char* dstTable;
   uint32_t streamId;
   char     listed;
diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c
index cd9853df03bab1a953ee8fd79e66a52e84ba157c..a158162dc56af24e4a114f4926e0d339dddf553a 100644
--- a/src/client/src/tscParseInsert.c
+++ b/src/client/src/tscParseInsert.c
@@ -107,14 +107,10 @@ int tsParseTime(SStrToken *pToken, int64_t *time, char **next, char *error, int1
       return tscInvalidOperationMsg(error, "value expected in timestamp", sToken.z);
     }
 
-    if (parseAbsoluteDuration(valueToken.z, valueToken.n, &interval) != TSDB_CODE_SUCCESS) {
+    if (parseAbsoluteDuration(valueToken.z, valueToken.n, &interval, timePrec) != TSDB_CODE_SUCCESS) {
       return TSDB_CODE_TSC_INVALID_OPERATION;
     }
 
-    if (timePrec == TSDB_TIME_PRECISION_MILLI) {
-      interval /= 1000;
-    }
-
     if (sToken.type == TK_PLUS) {
       useconds += interval;
     } else {
@@ -468,6 +464,10 @@ int tsParseOneRow(char **str, STableDataBlocks *pDataBlocks, int16_t timePrec, i
 
       int32_t cnt = 0;
       int32_t j = 0;
+      if (sToken.n >= TSDB_MAX_BYTES_PER_ROW) {
+        return tscSQLSyntaxErrMsg(pInsertParam->msg, "too long string", sToken.z);
+      }
+      
       for (uint32_t k = 1; k < sToken.n - 1; ++k) {
         if (sToken.z[k] == '\\' || (sToken.z[k] == delim && sToken.z[k + 1] == delim)) {
             tmpTokenBuf[j] = sToken.z[k + 1];
@@ -711,7 +711,7 @@ static int32_t doParseInsertStatement(SInsertStatementParam *pInsertParam, char
   }
 
   code = TSDB_CODE_TSC_INVALID_OPERATION;
-  char tmpTokenBuf[16*1024] = {0};  // used for deleting Escape character: \\, \', \"
+  char tmpTokenBuf[TSDB_MAX_BYTES_PER_ROW] = {0};  // used for deleting Escape character: \\, \', \"
 
   int32_t numOfRows = 0;
   code = tsParseValues(str, dataBuf, maxNumOfRows, pInsertParam, &numOfRows, tmpTokenBuf);
diff --git a/src/client/src/tscPrepare.c b/src/client/src/tscPrepare.c
index 3f12bc811bd2508583397c37723b498c710088d1..89d915a813f67915bf4e2210a9eacb8515c54f54 100644
--- a/src/client/src/tscPrepare.c
+++ b/src/client/src/tscPrepare.c
@@ -951,7 +951,10 @@ static int insertStmtBindParamBatch(STscStmt* stmt, TAOS_MULTI_BIND* bind, int c
     }
   }
 
-  assert(colIdx == -1 || (colIdx >= 0 && colIdx < pBlock->numOfParams));
+  if (!(colIdx == -1 || (colIdx >= 0 && colIdx < pBlock->numOfParams))) {
+    tscError("0x%"PRIx64" invalid colIdx:%d", pStmt->pSql->self, colIdx);
+    return invalidOperationMsg(tscGetErrorMsgPayload(&stmt->pSql->cmd), "invalid param colIdx");
+  }
 
   uint32_t totalDataSize = sizeof(SSubmitBlk) + (pCmd->batchSize + rowNum) * pBlock->rowSize;
   if (totalDataSize > pBlock->nAllocSize) {
@@ -1462,6 +1465,11 @@ int taos_stmt_prepare(TAOS_STMT* stmt, const char* sql, unsigned long length) {
     STMT_RET(TSDB_CODE_TSC_DISCONNECTED);
   }
 
+  if (sql == NULL) {
+    tscError("sql is NULL");
+    STMT_RET(invalidOperationMsg(tscGetErrorMsgPayload(&pStmt->pSql->cmd), "sql is NULL"));
+  }
+  
   if (pStmt->last != STMT_INIT) {
     tscError("prepare status error, last:%d", pStmt->last);
     STMT_RET(invalidOperationMsg(tscGetErrorMsgPayload(&pStmt->pSql->cmd), "prepare status error"));
@@ -1528,13 +1536,14 @@ int taos_stmt_prepare(TAOS_STMT* stmt, const char* sql, unsigned long length) {
 
 int taos_stmt_set_tbname_tags(TAOS_STMT* stmt, const char* name, TAOS_BIND* tags) {
   STscStmt* pStmt = (STscStmt*)stmt;
-  SSqlObj* pSql = pStmt->pSql;
-  SSqlCmd* pCmd = &pSql->cmd;
 
   if (stmt == NULL || pStmt->pSql == NULL || pStmt->taos == NULL) {
     STMT_RET(TSDB_CODE_TSC_DISCONNECTED);
   }
 
+  SSqlObj* pSql = pStmt->pSql;
+  SSqlCmd* pCmd = &pSql->cmd;
+
   if (name == NULL) {
     tscError("0x%"PRIx64" name is NULL", pSql->self);
     STMT_RET(invalidOperationMsg(tscGetErrorMsgPayload(&pStmt->pSql->cmd), "name is NULL"));
@@ -1735,7 +1744,7 @@ int taos_stmt_bind_single_param_batch(TAOS_STMT* stmt, TAOS_MULTI_BIND* bind, in
     STMT_RET(TSDB_CODE_TSC_DISCONNECTED);
   }
 
-  if (bind == NULL || bind->num <= 0 || bind->num > INT16_MAX) {
+  if (bind == NULL || bind->num <= 0 || bind->num > INT16_MAX || colIdx < 0) {
     tscError("0x%"PRIx64" invalid parameter", pStmt->pSql->self);
     STMT_RET(invalidOperationMsg(tscGetErrorMsgPayload(&pStmt->pSql->cmd), "invalid bind param"));
   }
diff --git a/src/client/src/tscProfile.c b/src/client/src/tscProfile.c
index b9ef98681001b657dafe02214853ef28e02e559c..661bd602b3532a1ddc5064ac4ae774bad568335e 100644
--- a/src/client/src/tscProfile.c
+++ b/src/client/src/tscProfile.c
@@ -19,6 +19,7 @@
 #include "ttimer.h"
 #include "tutil.h"
 #include "taosmsg.h"
+#include "tcq.h"
 
 #include "taos.h"
 
@@ -294,24 +295,34 @@ int tscBuildQueryStreamDesc(void *pMsg, STscObj *pObj) {
   return msgLen;
 }
 
-void tscKillConnection(STscObj *pObj) {
-  pthread_mutex_lock(&pObj->mutex);
+// cqContext->dbconn is killed then call this callback
+void cqConnKilledNotify(void* handle, void* conn) {
+  if (handle == NULL || conn == NULL){
+    return ;
+  } 
 
-  SSqlObj *pSql = pObj->sqlList;
-  while (pSql) {
-    pSql = pSql->next;
-  }
-  
+  SCqContext* pContext = (SCqContext*) handle;
+  if (pContext->dbConn == conn){
+    atomic_store_ptr(&(pContext->dbConn), NULL);
+  } 
+}
 
+void tscKillConnection(STscObj *pObj) {
+  // get stream header by locked
+  pthread_mutex_lock(&pObj->mutex);
   SSqlStream *pStream = pObj->streamList;
+  pthread_mutex_unlock(&pObj->mutex);
+
   while (pStream) {
     SSqlStream *tmp = pStream->next;
+    // set associate variant to NULL
+    cqConnKilledNotify(pStream->cqhandle, pObj);
+    // taos_close_stream function call pObj->mutet lock , careful death-lock
     taos_close_stream(pStream);
     pStream = tmp;
   }
 
-  pthread_mutex_unlock(&pObj->mutex);
-
   tscDebug("connection:%p is killed", pObj);
   taos_close(pObj);
 }
+
diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 38b93e3f315e314536492c7504292fe5b0fa9b67..ae51401ce08544045c12128bb89890e296b15a4e 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -150,12 +150,9 @@ int16_t getNewResColId(SSqlCmd* pCmd) {
 // formate  "type | size | value"
 bool serializeExprListToVariant(SArray* pList, tVariant **dst, int16_t colType) {
   bool ret = false;
-  if (!pList || pList->size <= 0) {
+  if (!pList || pList->size <= 0 || colType < 0) {
     return ret;
   }  
-  if (colType == TSDB_DATA_TYPE_DOUBLE || colType == TSDB_DATA_TYPE_FLOAT) {
-    return ret;
-  }
   
   tSqlExprItem* item = (tSqlExprItem *)taosArrayGet(pList, 0); 
   int32_t firstTokenType = item->pNode->token.type; 
@@ -438,7 +435,9 @@ int32_t tscValidateSqlInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
         }
         
       } else if (pInfo->type == TSDB_SQL_DROP_DNODE) {
-        pzName->n = strdequote(pzName->z);
+        if (pzName->type == TK_STRING) {
+          pzName->n = strdequote(pzName->z);
+        }
         strncpy(pCmd->payload, pzName->z, pzName->n);
       } else {  // drop user/account
         if (pzName->n >= TSDB_USER_LEN) {
@@ -516,7 +515,9 @@ int32_t tscValidateSqlInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       }
 
       SStrToken* id = taosArrayGet(pInfo->pMiscInfo->a, 0);
-      id->n = strdequote(id->z);
+      if (id->type == TK_STRING) {
+        id->n = strdequote(id->z);
+      }
       break;
     }
 
@@ -921,18 +922,15 @@ int32_t validateIntervalNode(SSqlObj* pSql, SQueryInfo* pQueryInfo, SSqlNode* pS
 
   // interval is not null
   SStrToken *t = &pSqlNode->interval.interval;
-  if (parseNatualDuration(t->z, t->n, &pQueryInfo->interval.interval, &pQueryInfo->interval.intervalUnit) != TSDB_CODE_SUCCESS) {
+  if (parseNatualDuration(t->z, t->n, &pQueryInfo->interval.interval,
+                          &pQueryInfo->interval.intervalUnit, tinfo.precision) != TSDB_CODE_SUCCESS) {
     return TSDB_CODE_TSC_INVALID_OPERATION;
   }
 
   if (pQueryInfo->interval.intervalUnit != 'n' && pQueryInfo->interval.intervalUnit != 'y') {
-    // if the unit of time window value is millisecond, change the value from microsecond
-    if (tinfo.precision == TSDB_TIME_PRECISION_MILLI) {
-      pQueryInfo->interval.interval = pQueryInfo->interval.interval / 1000;
-    }
 
     // interval cannot be less than 10 milliseconds
-    if (pQueryInfo->interval.interval < tsMinIntervalTime) {
+    if (convertTimePrecision(pQueryInfo->interval.interval, tinfo.precision, TSDB_TIME_PRECISION_MILLI) < tsMinIntervalTime) {
       return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
     }
   }
@@ -1008,6 +1006,8 @@ int32_t validateSessionNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode * pS
   const char* msg3 = "invalid column name";
   const char* msg4 = "invalid time window";
 
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
   // no session window
   if (!TPARSER_HAS_TOKEN(pSqlNode->sessionVal.gap)) {
     return TSDB_CODE_SUCCESS;
@@ -1017,7 +1017,7 @@ int32_t validateSessionNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode * pS
   SStrToken* gap = &pSqlNode->sessionVal.gap;
 
   char timeUnit = 0;
-  if (parseNatualDuration(gap->z, gap->n, &pQueryInfo->sessionWindow.gap, &timeUnit) != TSDB_CODE_SUCCESS) {
+  if (parseNatualDuration(gap->z, gap->n, &pQueryInfo->sessionWindow.gap, &timeUnit, tinfo.precision) != TSDB_CODE_SUCCESS) {
     return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg4);
   }
 
@@ -1025,13 +1025,6 @@ int32_t validateSessionNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode * pS
     return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1);
   }
 
-  // if the unit of time window value is millisecond, change the value from microsecond
-  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
-  STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
-  if (tinfo.precision == TSDB_TIME_PRECISION_MILLI) {
-    pQueryInfo->sessionWindow.gap = pQueryInfo->sessionWindow.gap / 1000;
-  }
-
   if (pQueryInfo->sessionWindow.gap != 0 && pQueryInfo->interval.interval != 0) {
     return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
   }
@@ -1068,7 +1061,8 @@ int32_t parseIntervalOffset(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SStrToken* of
     return TSDB_CODE_SUCCESS;
   }
 
-  if (parseNatualDuration(t->z, t->n, &pQueryInfo->interval.offset, &pQueryInfo->interval.offsetUnit) != TSDB_CODE_SUCCESS) {
+  if (parseNatualDuration(t->z, t->n, &pQueryInfo->interval.offset,
+                          &pQueryInfo->interval.offsetUnit, tinfo.precision) != TSDB_CODE_SUCCESS) {
     return TSDB_CODE_TSC_INVALID_OPERATION;
   }
 
@@ -1077,10 +1071,6 @@ int32_t parseIntervalOffset(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SStrToken* of
   }
 
   if (pQueryInfo->interval.offsetUnit != 'n' && pQueryInfo->interval.offsetUnit != 'y') {
-    // if the unit of time window value is millisecond, change the value from microsecond
-    if (tinfo.precision == TSDB_TIME_PRECISION_MILLI) {
-      pQueryInfo->interval.offset = pQueryInfo->interval.offset / 1000;
-    }
     if (pQueryInfo->interval.intervalUnit != 'n' && pQueryInfo->interval.intervalUnit != 'y') {
       if (pQueryInfo->interval.offset >= pQueryInfo->interval.interval) {
         return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
@@ -1125,12 +1115,10 @@ int32_t parseSlidingClause(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SStrToken* pSl
     return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3);
   }
 
-  parseAbsoluteDuration(pSliding->z, pSliding->n, &pQueryInfo->interval.sliding);
-  if (tinfo.precision == TSDB_TIME_PRECISION_MILLI) {
-    pQueryInfo->interval.sliding /= 1000;
-  }
+  parseAbsoluteDuration(pSliding->z, pSliding->n, &pQueryInfo->interval.sliding, tinfo.precision);
 
-  if (pQueryInfo->interval.sliding < tsMinSlidingTime) {
+  if (pQueryInfo->interval.sliding <
+      convertTimePrecision(tsMinSlidingTime, TSDB_TIME_PRECISION_MILLI, tinfo.precision)) {
     return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg0);
   }
 
@@ -2159,6 +2147,7 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
   const char* msg9 = "diff/derivative can no be applied to unsigned numeric type";
   const char* msg10 = "derivative duration should be greater than 1 Second";
   const char* msg11 = "third parameter in derivative should be 0 or 1";
+  const char* msg12 = "parameter is out of range [1, 100]";
 
   switch (functionId) {
     case TSDB_FUNC_COUNT: {
@@ -2338,8 +2327,10 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
         }
 
         if (info.precision == TSDB_TIME_PRECISION_MILLI) {
+          tickPerSec /= 1000000;
+        } else if (info.precision == TSDB_TIME_PRECISION_MICRO) {
           tickPerSec /= 1000;
-        }
+	} 
 
         if (tickPerSec <= 0 || tickPerSec < TSDB_TICK_PER_SECOND(info.precision)) {
           return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg10);
@@ -2562,7 +2553,7 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
 
         int64_t nTop = GET_INT32_VAL(val);
         if (nTop <= 0 || nTop > 100) {  // todo use macro
-          return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg5);
+          return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg12);
         }
 
         // todo REFACTOR
@@ -3313,8 +3304,9 @@ static int32_t doExtractColumnFilterInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo,
       return retVal;
     }
   } else if ((colType == TSDB_DATA_TYPE_TIMESTAMP) && (TSDB_DATA_TYPE_BIGINT == pRight->value.nType)) {
-    if ((timePrecision == TSDB_TIME_PRECISION_MILLI) && (pRight->flags & (1 << EXPR_FLAG_US_TIMESTAMP))) {
-      pRight->value.i64 /= 1000;
+    if (pRight->flags & (1 << EXPR_FLAG_NS_TIMESTAMP)) {
+      pRight->value.i64 =
+          convertTimePrecision(pRight->value.i64, TSDB_TIME_PRECISION_NANO, timePrecision);
     }
   }
 
@@ -4568,11 +4560,7 @@ static int32_t validateTagCondExpr(SSqlCmd* pCmd, tExprNode *p) {
       free(tmp);
     } else {
       double tmp;
-      if (p->_node.optr == TSDB_RELATION_IN) {
-        retVal = validateParamOfRelationIn(vVariant, schemaType);
-      } else {
-        retVal = tVariantDump(vVariant, (char*)&tmp, schemaType, false);
-      }
+      retVal = tVariantDump(vVariant, (char*)&tmp, schemaType, false);
     }
     
     if (retVal != TSDB_CODE_SUCCESS) {
@@ -4857,7 +4845,7 @@ int32_t getTimeRange(STimeWindow* win, tSqlExpr* pRight, int32_t optr, int16_t t
 
     char* seg = strnchr(pRight->value.pz, '-', pRight->value.nLen, false);
     if (seg != NULL) {
-      if (taosParseTime(pRight->value.pz, &val, pRight->value.nLen, TSDB_TIME_PRECISION_MICRO, tsDaylight) == TSDB_CODE_SUCCESS) {
+      if (taosParseTime(pRight->value.pz, &val, pRight->value.nLen, timePrecision, tsDaylight) == TSDB_CODE_SUCCESS) {
         parsed = true;
       } else {
         return TSDB_CODE_TSC_INVALID_OPERATION;
@@ -4870,18 +4858,6 @@ int32_t getTimeRange(STimeWindow* win, tSqlExpr* pRight, int32_t optr, int16_t t
         return TSDB_CODE_TSC_INVALID_OPERATION;
       }
     }
-  } else if (pRight->tokenId == TK_INTEGER && timePrecision == TSDB_TIME_PRECISION_MILLI) {
-    /*
-     * if the pRight->tokenId == TK_INTEGER/TK_FLOAT, the value is adaptive, we
-     * need the time precision in metermeta to transfer the value in MICROSECOND
-     *
-     * Additional check to avoid data overflow
-     */
-    if (pRight->value.i64 <= INT64_MAX / 1000) {
-      pRight->value.i64 *= 1000;
-    }
-  } else if (pRight->tokenId == TK_FLOAT && timePrecision == TSDB_TIME_PRECISION_MILLI) {
-    pRight->value.dKey *= 1000;
   }
 
   if (!parsed) {
@@ -4889,38 +4865,27 @@ int32_t getTimeRange(STimeWindow* win, tSqlExpr* pRight, int32_t optr, int16_t t
      * failed to parse timestamp in regular formation, try next
      * it may be a epoch time in string format
      */
-    tVariantDump(&pRight->value, (char*)&val, TSDB_DATA_TYPE_BIGINT, true);
-
-    /*
-     * transfer it into MICROSECOND format if it is a string, since for
-     * TK_INTEGER/TK_FLOAT the value has been transferred
-     *
-     * additional check to avoid data overflow
-     */
-    if (pRight->tokenId == TK_STRING && timePrecision == TSDB_TIME_PRECISION_MILLI) {
-      if (val <= INT64_MAX / 1000) {
-        val *= 1000;
-      }
+    if (pRight->flags & (1 << EXPR_FLAG_NS_TIMESTAMP)) {
+      pRight->value.i64 = convertTimePrecision(pRight->value.i64, TSDB_TIME_PRECISION_NANO, timePrecision);
     }
-  }
-
-  int32_t delta = 1;
-  /* for millisecond, delta is 1ms=1000us */
-  if (timePrecision == TSDB_TIME_PRECISION_MILLI) {
-    delta *= 1000;
+    
+    tVariantDump(&pRight->value, (char*)&val, TSDB_DATA_TYPE_BIGINT, true);
   }
 
   if (optr == TK_LE) {
     win->ekey = val;
   } else if (optr == TK_LT) {
-    win->ekey = val - delta;
+    win->ekey = val - 1;
   } else if (optr == TK_GT) {
-    win->skey = val + delta;
+    win->skey = val + 1;
   } else if (optr == TK_GE) {
     win->skey = val;
   } else if (optr == TK_EQ) {
     win->ekey = win->skey = val;
+  } else if (optr == TK_NE) {
+    return TSDB_CODE_TSC_INVALID_OPERATION;
   }
+
   return TSDB_CODE_SUCCESS;
 }
 
@@ -5638,8 +5603,10 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
 int32_t validateSqlFunctionInStreamSql(SSqlCmd* pCmd, SQueryInfo* pQueryInfo) {
   const char* msg0 = "sample interval can not be less than 10ms.";
   const char* msg1 = "functions not allowed in select clause";
-
-  if (pQueryInfo->interval.interval != 0 && pQueryInfo->interval.interval < 10 &&
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
+  if (pQueryInfo->interval.interval != 0 &&
+      convertTimePrecision(pQueryInfo->interval.interval, tinfo.precision, TSDB_TIME_PRECISION_MILLI)< 10 &&
      pQueryInfo->interval.intervalUnit != 'n' &&
      pQueryInfo->interval.intervalUnit != 'y') {
     return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg0);
@@ -5969,48 +5936,40 @@ int32_t validateLimitNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode* pSqlN
 }
 
 static int32_t setKeepOption(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDbInfo* pCreateDb) {
-  const char* msg = "invalid number of options";
+  const char* msg1 = "invalid number of keep options";
+  const char* msg2 = "invalid keep value";
+  const char* msg3 = "invalid keep value, should be keep0 <= keep1 <= keep2";
 
-  pMsg->daysToKeep = htonl(-1);
+  pMsg->daysToKeep0 = htonl(-1);
   pMsg->daysToKeep1 = htonl(-1);
   pMsg->daysToKeep2 = htonl(-1);
 
   SArray* pKeep = pCreateDb->keep;
   if (pKeep != NULL) {
     size_t s = taosArrayGetSize(pKeep);
+#ifdef _STORAGE
+    if (s >= 4 ||s <= 0) {
+#else
+    if (s != 1) {
+#endif
+      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1);
+    }
+
     tVariantListItem* p0 = taosArrayGet(pKeep, 0);
-    switch (s) {
-      case 1: {
-        if ((int32_t)p0->pVar.i64 <= 0) {
-          return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg);
-        }
-        pMsg->daysToKeep = htonl((int32_t)p0->pVar.i64);
-      }
-        break;
-      case 2: {
-        tVariantListItem* p1 = taosArrayGet(pKeep, 1);
-        if ((int32_t)p0->pVar.i64 <= 0 || (int32_t)p1->pVar.i64 <= 0) {
-          return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg);
-        }        
-        pMsg->daysToKeep = htonl((int32_t)p0->pVar.i64);
-        pMsg->daysToKeep1 = htonl((int32_t)p1->pVar.i64);
-        break;
-      }
-      case 3: {
-        tVariantListItem* p1 = taosArrayGet(pKeep, 1);
-        tVariantListItem* p2 = taosArrayGet(pKeep, 2);
+    tVariantListItem* p1 = (s > 1) ? taosArrayGet(pKeep, 1) : p0;
+    tVariantListItem* p2 = (s > 2) ? taosArrayGet(pKeep, 2) : p1;
+    
+    if ((int32_t)p0->pVar.i64 <= 0 || (int32_t)p1->pVar.i64 <= 0 || (int32_t)p2->pVar.i64 <= 0) {
+      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
+    }
+    if (!(((int32_t)p0->pVar.i64 <= (int32_t)p1->pVar.i64) && ((int32_t)p1->pVar.i64 <= (int32_t)p2->pVar.i64))) {
+      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3);
+    }
 
-        if ((int32_t)p0->pVar.i64 <= 0 || (int32_t)p1->pVar.i64 <= 0 || (int32_t)p2->pVar.i64 <= 0) {
-          return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg);
-        } 
+    pMsg->daysToKeep0 = htonl((int32_t)p0->pVar.i64);
+    pMsg->daysToKeep1 = htonl((int32_t)p1->pVar.i64);
+    pMsg->daysToKeep2 = htonl((int32_t)p2->pVar.i64);
 
-        pMsg->daysToKeep = htonl((int32_t)p0->pVar.i64);
-        pMsg->daysToKeep1 = htonl((int32_t)p1->pVar.i64);
-        pMsg->daysToKeep2 = htonl((int32_t)p2->pVar.i64);
-        break;
-      }
-      default: { return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg); }
-    }
   }
 
   return TSDB_CODE_SUCCESS;
@@ -6032,11 +5991,15 @@ static int32_t setTimePrecision(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDbInfo
     } else if (strncmp(pToken->z, TSDB_TIME_PRECISION_MICRO_STR, pToken->n) == 0 &&
                strlen(TSDB_TIME_PRECISION_MICRO_STR) == pToken->n) {
       pMsg->precision = TSDB_TIME_PRECISION_MICRO;
+    } else if (strncmp(pToken->z, TSDB_TIME_PRECISION_NANO_STR, pToken->n) == 0 &&
+               strlen(TSDB_TIME_PRECISION_NANO_STR) == pToken->n) {
+      pMsg->precision = TSDB_TIME_PRECISION_NANO;
     } else {
       return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg);
     }
   }
 
+
   return TSDB_CODE_SUCCESS;
 }
 
@@ -6643,6 +6606,13 @@ int32_t tscCheckCreateDbParams(SSqlCmd* pCmd, SCreateDbMsg* pCreate) {
     return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg);
   }
 
+  int32_t blocks = ntohl(pCreate->totalBlocks);
+  if (blocks != -1 && (blocks < TSDB_MIN_TOTAL_BLOCKS || blocks > TSDB_MAX_TOTAL_BLOCKS)) {
+    snprintf(msg, tListLen(msg), "invalid db option totalBlocks: %d valid range: [%d, %d]", blocks,
+             TSDB_MIN_TOTAL_BLOCKS, TSDB_MAX_TOTAL_BLOCKS);
+    return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg);
+  }
+
   if (pCreate->quorum != -1 &&
       (pCreate->quorum < TSDB_MIN_DB_QUORUM_OPTION || pCreate->quorum > TSDB_MAX_DB_QUORUM_OPTION)) {
     snprintf(msg, tListLen(msg), "invalid db option quorum: %d valid range: [%d, %d]", pCreate->quorum,
@@ -6671,9 +6641,10 @@ int32_t tscCheckCreateDbParams(SSqlCmd* pCmd, SCreateDbMsg* pCreate) {
     return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg);
   }
 
-  if (pCreate->precision != TSDB_TIME_PRECISION_MILLI && pCreate->precision != TSDB_TIME_PRECISION_MICRO) {
-    snprintf(msg, tListLen(msg), "invalid db option timePrecision: %d valid value: [%d, %d]", pCreate->precision,
-             TSDB_TIME_PRECISION_MILLI, TSDB_TIME_PRECISION_MICRO);
+  if (pCreate->precision != TSDB_TIME_PRECISION_MILLI && pCreate->precision != TSDB_TIME_PRECISION_MICRO &&
+      pCreate->precision != TSDB_TIME_PRECISION_NANO) {
+    snprintf(msg, tListLen(msg), "invalid db option timePrecision: %d valid value: [%d, %d, %d]", pCreate->precision,
+             TSDB_TIME_PRECISION_MILLI, TSDB_TIME_PRECISION_MICRO, TSDB_TIME_PRECISION_NANO);
     return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg);
   }
 
@@ -7072,6 +7043,7 @@ int32_t doCheckForStream(SSqlObj* pSql, SSqlInfo* pInfo) {
     return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
   }
 
+  // project query primary column must be timestamp type
   if (tscIsProjectionQuery(pQueryInfo)) {
     SExprInfo* pExpr = tscExprGet(pQueryInfo, 0);
     if (pExpr->base.colInfo.colId != PRIMARYKEY_TIMESTAMP_COL_INDEX) {
@@ -7080,7 +7052,7 @@ int32_t doCheckForStream(SSqlObj* pSql, SSqlInfo* pInfo) {
   } else {
     if (pQueryInfo->interval.interval == 0) {
       return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg7);
-    }
+    }  
   }
 
   // set the created table[stream] name
@@ -7876,18 +7848,12 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
     }
 
     // set where info
-    STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
-
     if (pSqlNode->pWhere != NULL) {
       if (validateWhereNode(pQueryInfo, &pSqlNode->pWhere, pSql) != TSDB_CODE_SUCCESS) {
         return TSDB_CODE_TSC_INVALID_OPERATION;
       }
 
       pSqlNode->pWhere = NULL;
-      if (tinfo.precision == TSDB_TIME_PRECISION_MILLI) {
-        pQueryInfo->window.skey = pQueryInfo->window.skey / 1000;
-        pQueryInfo->window.ekey = pQueryInfo->window.ekey / 1000;
-      }
     } else {
       if (taosArrayGetSize(pSqlNode->from->list) > 1) { // Cross join not allowed yet
         return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), "cross join not supported yet");
@@ -8111,18 +8077,23 @@ int32_t exprTreeFromSqlExpr(SSqlCmd* pCmd, tExprNode **pExpr, const tSqlExpr* pS
       
       return TSDB_CODE_SUCCESS;
     } else if (pSqlExpr->tokenId == TK_SET) {
-      int32_t type = -1;
+      int32_t colType = -1;
       STableMeta* pTableMeta = tscGetMetaInfo(pQueryInfo, 0)->pTableMeta;
       if (pCols != NULL) {
         SColIndex* idx = taosArrayGet(pCols, 0);
         SSchema* pSchema = tscGetTableColumnSchema(pTableMeta, idx->colIndex);
         if (pSchema != NULL) {
-          type = pSchema->type; 
+          colType = pSchema->type; 
         }
       }
 
       tVariant *pVal;
-      if (serializeExprListToVariant(pSqlExpr->pParam, &pVal, type) == false) {
+      if (colType >= TSDB_DATA_TYPE_TINYINT && colType <= TSDB_DATA_TYPE_BIGINT) {
+        colType = TSDB_DATA_TYPE_BIGINT;
+      } else if (colType == TSDB_DATA_TYPE_FLOAT || colType == TSDB_DATA_TYPE_DOUBLE) {
+        colType = TSDB_DATA_TYPE_DOUBLE;
+      }
+      if (serializeExprListToVariant(pSqlExpr->pParam, &pVal, colType) == false) {
         return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), "not support filter expression");
       }
       *pExpr = calloc(1, sizeof(tExprNode));
diff --git a/src/client/src/tscStream.c b/src/client/src/tscStream.c
index 9b13cd2140dea3bc416f1a418d69b2ef0e187992..da5bdf669fa41e4e44cd5551743c4feb77f447ac 100644
--- a/src/client/src/tscStream.c
+++ b/src/client/src/tscStream.c
@@ -53,9 +53,7 @@ static int64_t tscGetRetryDelayTime(SSqlStream* pStream, int64_t slidingTime, in
 
   if (pStream->interval.intervalUnit != 'n' && pStream->interval.intervalUnit != 'y') {
     // change to ms
-    if (prec == TSDB_TIME_PRECISION_MICRO) {
-      slidingTime = slidingTime / 1000;
-    }
+    slidingTime = convertTimePrecision(slidingTime, pStream->precision, TSDB_TIME_PRECISION_MILLI);
 
     if (slidingTime < retryDelta) {
       return slidingTime;
@@ -139,8 +137,13 @@ static void tscProcessStreamTimer(void *handle, void *tmrId) {
 
   pStream->numOfRes = 0;  // reset the numOfRes.
   SSqlObj *pSql = pStream->pSql;
+
+  // pSql ==  NULL  maybe killStream already called
+  if(pSql == NULL) {
+    return ;
+  }
   SQueryInfo* pQueryInfo = tscGetQueryInfo(&pSql->cmd);
-  tscDebug("0x%"PRIx64" timer launch query", pSql->self);
+  tscDebug("0x%"PRIx64" add into timer", pSql->self);
 
   if (pStream->isProject) {
     /*
@@ -157,11 +160,7 @@ static void tscProcessStreamTimer(void *handle, void *tmrId) {
     pQueryInfo->window.skey = pStream->stime;
     int64_t etime = taosGetTimestamp(pStream->precision);
     // delay to wait all data in last time window
-    if (pStream->precision == TSDB_TIME_PRECISION_MICRO) {
-      etime -= tsMaxStreamComputDelay * 1000l;
-    } else {
-      etime -= tsMaxStreamComputDelay;
-    }
+    etime -= convertTimePrecision(tsMaxStreamComputDelay, TSDB_TIME_PRECISION_MILLI, pStream->precision);
     if (etime > pStream->etime) {
       etime = pStream->etime;
     } else if (pStream->interval.intervalUnit != 'y' && pStream->interval.intervalUnit != 'n') {
@@ -178,8 +177,8 @@ static void tscProcessStreamTimer(void *handle, void *tmrId) {
       int64_t timer = pStream->interval.sliding;
       if (pStream->interval.intervalUnit == 'y' || pStream->interval.intervalUnit == 'n') {
         timer = 86400 * 1000l;
-      } else if (pStream->precision == TSDB_TIME_PRECISION_MICRO) {
-        timer /= 1000l;
+      } else {
+        timer = convertTimePrecision(timer, pStream->precision, TSDB_TIME_PRECISION_MILLI);
       }
       tscSetRetryTimer(pStream, pSql, timer);
       return;
@@ -339,8 +338,12 @@ static void tscSetRetryTimer(SSqlStream *pStream, SSqlObj *pSql, int64_t timer)
   if (pStream->isProject) {
     int64_t now = taosGetTimestamp(pStream->precision);
     int64_t etime = now > pStream->etime ? pStream->etime : now;
-
-    if (pStream->etime < now && now - pStream->etime > tsMaxRetentWindow) {
+    int64_t maxRetent = tsMaxRetentWindow * 1000;
+    if(pStream->precision == TSDB_TIME_PRECISION_MICRO) {
+      maxRetent *= 1000;
+    }
+         
+    if (pStream->etime < now && now - pStream->etime > maxRetent) {
       /*
        * current time window will be closed, since it too early to exceed the maxRetentWindow value
        */
@@ -369,9 +372,8 @@ static void tscSetRetryTimer(SSqlStream *pStream, SSqlObj *pSql, int64_t timer)
 }
 
 static int64_t getLaunchTimeDelay(const SSqlStream* pStream) {
-  int64_t maxDelay =
-      (pStream->precision == TSDB_TIME_PRECISION_MICRO) ? tsMaxStreamComputDelay * 1000L : tsMaxStreamComputDelay;
-  
+  int64_t maxDelay = convertTimePrecision(tsMaxStreamComputDelay, TSDB_TIME_PRECISION_MILLI, pStream->precision);
+
   int64_t delayDelta = maxDelay;
   if (pStream->interval.intervalUnit != 'n' && pStream->interval.intervalUnit != 'y') {
     delayDelta = (int64_t)(pStream->interval.sliding * tsStreamComputDelayRatio);
@@ -438,16 +440,14 @@ static void tscSetNextLaunchTimer(SSqlStream *pStream, SSqlObj *pSql) {
 
   timer += getLaunchTimeDelay(pStream);
   
-  if (pStream->precision == TSDB_TIME_PRECISION_MICRO) {
-    timer = timer / 1000L;
-  }
+  timer = convertTimePrecision(timer, pStream->precision, TSDB_TIME_PRECISION_MILLI);
 
   tscSetRetryTimer(pStream, pSql, timer);
 }
 
 static int32_t tscSetSlidingWindowInfo(SSqlObj *pSql, SSqlStream *pStream) {
   int64_t minIntervalTime =
-      (pStream->precision == TSDB_TIME_PRECISION_MICRO) ? tsMinIntervalTime * 1000L : tsMinIntervalTime;
+      convertTimePrecision(tsMinIntervalTime, TSDB_TIME_PRECISION_MILLI, pStream->precision);
   
   SQueryInfo* pQueryInfo = tscGetQueryInfo(&pSql->cmd);
 
@@ -471,7 +471,7 @@ static int32_t tscSetSlidingWindowInfo(SSqlObj *pSql, SSqlStream *pStream) {
   }
 
   int64_t minSlidingTime =
-      (pStream->precision == TSDB_TIME_PRECISION_MICRO) ? tsMinSlidingTime * 1000L : tsMinSlidingTime;
+      convertTimePrecision(tsMinSlidingTime, TSDB_TIME_PRECISION_MILLI, pStream->precision);
 
   if (pQueryInfo->interval.intervalUnit != 'n' && pQueryInfo->interval.intervalUnit!= 'y' && pQueryInfo->interval.sliding < minSlidingTime) {
     tscWarn("0x%"PRIx64" stream:%p, original sliding value:%" PRId64 " too small, reset to:%" PRId64, pSql->self, pStream,
@@ -539,13 +539,12 @@ static int64_t tscGetLaunchTimestamp(const SSqlStream *pStream) {
     timer = pStream->stime - now;
   }
 
-  int64_t startDelay =
-      (pStream->precision == TSDB_TIME_PRECISION_MICRO) ? tsStreamCompStartDelay * 1000L : tsStreamCompStartDelay;
-  
+  int64_t startDelay = convertTimePrecision(tsStreamCompStartDelay, TSDB_TIME_PRECISION_MILLI, pStream->precision);
+
   timer += getLaunchTimeDelay(pStream);
   timer += startDelay;
   
-  return (pStream->precision == TSDB_TIME_PRECISION_MICRO) ? timer / 1000L : timer;
+  return convertTimePrecision(timer, pStream->precision, TSDB_TIME_PRECISION_MILLI);
 }
 
 static void tscCreateStream(void *param, TAOS_RES *res, int code) {
@@ -664,7 +663,7 @@ void cbParseSql(void* param, TAOS_RES* res, int code) {
 }
 
 TAOS_STREAM *taos_open_stream_withname(TAOS *taos, const char* dstTable, const char *sqlstr, void (*fp)(void *param, TAOS_RES *, TAOS_ROW row),
-                              int64_t stime, void *param, void (*callback)(void *)) {
+                              int64_t stime, void *param, void (*callback)(void *), void* cqhandle) {
   STscObj *pObj = (STscObj *)taos;
   if (pObj == NULL || pObj->signature != pObj) return NULL;
 
@@ -697,6 +696,7 @@ TAOS_STREAM *taos_open_stream_withname(TAOS *taos, const char* dstTable, const c
   pStream->callback = callback;
   pStream->param = param;
   pStream->pSql = pSql;
+  pStream->cqhandle = cqhandle;
   pSql->pStream = pStream;
   pSql->param = pStream;
   pSql->maxRetry = TSDB_MAX_REPLICA;
@@ -745,7 +745,7 @@ TAOS_STREAM *taos_open_stream_withname(TAOS *taos, const char* dstTable, const c
 
 TAOS_STREAM *taos_open_stream(TAOS *taos, const char *sqlstr, void (*fp)(void *param, TAOS_RES *, TAOS_ROW row),
                               int64_t stime, void *param, void (*callback)(void *)) {  
-  return taos_open_stream_withname(taos, "", sqlstr, fp, stime, param, callback);
+  return taos_open_stream_withname(taos, "", sqlstr, fp, stime, param, callback, NULL);
 }
 
 void taos_close_stream(TAOS_STREAM *handle) {
diff --git a/src/client/src/tscSub.c b/src/client/src/tscSub.c
index 42330aa18e48eb60389ef3056c96a2aab386a6ca..7a0b3451c3b415e8e565fe091de6d1ed0e478409 100644
--- a/src/client/src/tscSub.c
+++ b/src/client/src/tscSub.c
@@ -265,7 +265,7 @@ static int tscUpdateSubscription(STscObj* pObj, SSub* pSub) {
 
   SSqlCmd* pCmd = &pSql->cmd;
 
-  pSub->lastSyncTime = taosGetTimestampMs();
+  TSDB_QUERY_CLEAR_TYPE(tscGetQueryInfo(pCmd)->type, TSDB_QUERY_TYPE_MULTITABLE_QUERY);
 
   STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd,  0);
   if (UTIL_TABLE_IS_NORMAL_TABLE(pTableMetaInfo)) {
@@ -276,6 +276,8 @@ static int tscUpdateSubscription(STscObj* pObj, SSub* pSub) {
       taosArrayClear(pSub->progress);
       taosArrayPush(pSub->progress, &target);
     }
+    
+    pSub->lastSyncTime = taosGetTimestampMs();
     return 1;
   }
 
@@ -305,7 +307,11 @@ static int tscUpdateSubscription(STscObj* pObj, SSub* pSub) {
   }
   taosArrayDestroy(tables);
 
-  TSDB_QUERY_SET_TYPE(tscGetQueryInfo(pCmd)->type, TSDB_QUERY_TYPE_MULTITABLE_QUERY);
+  if (pTableMetaInfo->pVgroupTables && taosArrayGetSize(pTableMetaInfo->pVgroupTables) > 0) {
+    TSDB_QUERY_SET_TYPE(tscGetQueryInfo(pCmd)->type, TSDB_QUERY_TYPE_MULTITABLE_QUERY);
+  }
+
+  pSub->lastSyncTime = taosGetTimestampMs();
   return 1;
 }
 
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index 49ce73854520aa95249d9f42590acd36d83bb523..e7f0606db2ad1bcfbb257d79f016e91e87a8e787 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -3152,6 +3152,13 @@ int32_t tscHandleMultivnodeInsert(SSqlObj *pSql) {
 
   // it is the failure retry insert
   if (pSql->pSubs != NULL) {
+    int32_t blockNum = (int32_t)taosArrayGetSize(pCmd->insertParam.pDataBlocks);
+    if (pSql->subState.numOfSub != blockNum) {
+      tscError("0x%"PRIx64" sub num:%d is not same with data block num:%d", pSql->self, pSql->subState.numOfSub, blockNum);
+      pRes->code = TSDB_CODE_TSC_APP_ERROR;
+      return pRes->code;
+    }
+    
     for(int32_t i = 0; i < pSql->subState.numOfSub; ++i) {
       SSqlObj* pSub = pSql->pSubs[i];
       SInsertSupporter* pSup = calloc(1, sizeof(SInsertSupporter));
diff --git a/src/common/src/texpr.c b/src/common/src/texpr.c
index 6fa4d68734df6fde94725026bd65b219cc6564ab..0e9ec053cc5fb0f402fe9ffd42f3435fb4ca3cad 100644
--- a/src/common/src/texpr.c
+++ b/src/common/src/texpr.c
@@ -470,6 +470,9 @@ void buildFilterSetFromBinary(void **q, const char *buf, int32_t len) {
   SBufferReader br = tbufInitReader(buf, len, false); 
   uint32_t type  = tbufReadUint32(&br);     
   SHashObj *pObj = taosHashInit(256, taosGetDefaultHashFunction(type), true, false);
+  
+  taosHashSetEqualFp(pObj, taosGetDefaultEqualFunction(type)); 
+  
   int dummy = -1;
   int32_t sz = tbufReadInt32(&br);
   for (int32_t i = 0; i < sz; i++) {
diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c
index eae2fab32b892bdc9ede258467217df0d82eccea..af21ef6d82f96de6c2d0349911b3176f14510ee2 100644
--- a/src/common/src/tglobal.c
+++ b/src/common/src/tglobal.c
@@ -831,6 +831,16 @@ static void doInitGlobalConfig(void) {
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
 
+  cfg.option = "precision";
+  cfg.ptr = &tsTimePrecision;
+  cfg.valType = TAOS_CFG_VTYPE_INT8;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = TSDB_MIN_PRECISION;
+  cfg.maxValue = TSDB_MAX_PRECISION;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
   cfg.option = "comp";
   cfg.ptr = &tsCompression;
   cfg.valType = TAOS_CFG_VTYPE_INT8;
@@ -901,6 +911,16 @@ static void doInitGlobalConfig(void) {
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
 
+  cfg.option = "cachelast";
+  cfg.ptr = &tsCacheLastRow;
+  cfg.valType = TAOS_CFG_VTYPE_INT8;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = TSDB_MIN_DB_CACHE_LAST_ROW;
+  cfg.maxValue = TSDB_MAX_DB_CACHE_LAST_ROW;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
   cfg.option = "mqttHostName";
   cfg.ptr = tsMqttHostName;
   cfg.valType = TAOS_CFG_VTYPE_STRING;
diff --git a/src/common/src/tvariant.c b/src/common/src/tvariant.c
index 9988450c30f341d03a97c2393e1939aff96daf7d..33dab51633b244326b0490c6bf7b784bc41fe77f 100644
--- a/src/common/src/tvariant.c
+++ b/src/common/src/tvariant.c
@@ -74,7 +74,7 @@ void tVariantCreate(tVariant *pVar, SStrToken *token) {
 
     case TSDB_DATA_TYPE_BINARY: {
       pVar->pz = strndup(token->z, token->n);
-      pVar->nLen = strdequote(pVar->pz);
+      pVar->nLen = strRmquote(pVar->pz, token->n);
       break;
     }
     
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBPreparedStatementTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBPreparedStatementTest.java
index 3ad51479d6dece8d4d717a3609615b9ba2f93349..3f8bef4a7ea00915925b2924b08ad8c453420416 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBPreparedStatementTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBPreparedStatementTest.java
@@ -6,6 +6,8 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.sql.*;
 import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.Random;
 
 public class TSDBPreparedStatementTest {
 
@@ -295,6 +297,296 @@ public class TSDBPreparedStatementTest {
             assertAllNullExceptTimestamp(rs, ts);
         }
     }
+
+    @Test
+    public void executeTest() throws SQLException {   
+        Statement stmt = conn.createStatement();            
+
+        int numOfRows = 1000;        
+
+        for (int loop = 0; loop < 10; loop++){
+            stmt.execute("drop table if exists weather_test");
+            stmt.execute("create table weather_test(ts timestamp, f1 nchar(4), f2 float, f3 double, f4 timestamp, f5 int, f6 bool, f7 binary(10))");            
+
+            TSDBPreparedStatement s = (TSDBPreparedStatement) conn.prepareStatement("insert into ? values(?, ?, ?, ?, ?, ?, ?, ?)");
+            Random r = new Random();
+            s.setTableName("weather_test");
+            
+            ArrayList<Long> ts = new ArrayList<Long>();
+            for(int i = 0; i < numOfRows; i++) {
+                ts.add(System.currentTimeMillis() + i);
+            }        
+            s.setTimestamp(0, ts);
+
+            int random = 10 + r.nextInt(5);
+            ArrayList<String> s2 = new ArrayList<String>();        
+            for(int i = 0; i < numOfRows; i++) {
+                if(i % random == 0) {
+                    s2.add(null);
+                }else{
+                    s2.add("分支" + i % 4);
+                }
+            }        
+            s.setNString(1, s2, 4);      
+
+            random = 10 + r.nextInt(5);
+            ArrayList<Float> s3 = new ArrayList<Float>();        
+            for(int i = 0; i < numOfRows; i++) {
+                if(i % random == 0) {
+                    s3.add(null);
+                }else{
+                    s3.add(r.nextFloat());
+                }
+            }        
+            s.setFloat(2, s3);
+
+            random = 10 + r.nextInt(5);
+            ArrayList<Double> s4 = new ArrayList<Double>();
+            for(int i = 0; i < numOfRows; i++) {
+                if(i % random == 0) {
+                    s4.add(null);
+                }else{
+                    s4.add(r.nextDouble());
+                }
+            }
+            s.setDouble(3, s4);
+
+            random = 10 + r.nextInt(5);
+            ArrayList<Long> ts2 = new ArrayList<Long>();
+            for(int i = 0; i < numOfRows; i++) {
+                if(i % random == 0) {
+                    ts2.add(null);
+                }else{
+                    ts2.add(System.currentTimeMillis() + i);
+                }
+            }
+            s.setTimestamp(4, ts2);
+
+            random = 10 + r.nextInt(5);
+            ArrayList<Integer>  vals = new ArrayList<>();
+            for(int i = 0; i < numOfRows; i++) {
+                if(i % random == 0) {
+                    vals.add(null);
+                }else{
+                    vals.add(r.nextInt());
+                }                
+            }
+            s.setInt(5, vals);
+
+            random = 10 + r.nextInt(5);
+            ArrayList<Boolean> sb = new ArrayList<>();
+            for(int i = 0; i < numOfRows; i++) {
+                if(i % random == 0) {
+                    sb.add(null);
+                }else{
+                    sb.add(i % 2 == 0 ? true : false);
+                }
+            }
+            s.setBoolean(6, sb);        
+
+            random = 10 + r.nextInt(5);
+            ArrayList<String> s5 = new ArrayList<String>();
+            for(int i = 0; i < numOfRows; i++) {
+                if(i % random == 0) {
+                    s5.add(null);
+                }else{
+                    s5.add("test" + i % 10);
+                }
+            }
+            s.setString(7, s5, 10);        
+
+            s.columnDataAddBatch();
+            s.columnDataExecuteBatch();
+            s.columnDataCloseBatch();
+
+            String sql = "select * from weather_test";
+            PreparedStatement statement = conn.prepareStatement(sql);
+            ResultSet rs = statement.executeQuery();
+            int rows = 0;
+            while(rs.next()) {
+                rows++;
+            }
+            Assert.assertEquals(numOfRows, rows);            
+        }
+    }
+
+    @Test
+    public void bindDataSelectColumnTest() throws SQLException {   
+        Statement stmt = conn.createStatement();            
+
+        int numOfRows = 1000;        
+
+        for (int loop = 0; loop < 10; loop++){
+            stmt.execute("drop table if exists weather_test");
+            stmt.execute("create table weather_test(ts timestamp, f1 nchar(4), f2 float, f3 double, f4 timestamp, f5 int, f6 bool, f7 binary(10))");            
+
+            TSDBPreparedStatement s = (TSDBPreparedStatement) conn.prepareStatement("insert into ? (ts, f1, f7) values(?, ?, ?)");
+            Random r = new Random();
+            s.setTableName("weather_test");
+            
+            ArrayList<Long> ts = new ArrayList<Long>();
+            for(int i = 0; i < numOfRows; i++) {
+                ts.add(System.currentTimeMillis() + i);
+            }        
+            s.setTimestamp(0, ts);
+
+            int random = 10 + r.nextInt(5);
+            ArrayList<String> s2 = new ArrayList<String>();        
+            for(int i = 0; i < numOfRows; i++) {
+                if(i % random == 0) {
+                    s2.add(null);
+                }else{
+                    s2.add("分支" + i % 4);
+                }
+            }        
+            s.setNString(1, s2, 4);                   
+
+            random = 10 + r.nextInt(5);
+            ArrayList<String> s3 = new ArrayList<String>();
+            for(int i = 0; i < numOfRows; i++) {
+                if(i % random == 0) {
+                    s3.add(null);
+                }else{
+                    s3.add("test" + i % 10);
+                }
+            }
+            s.setString(2, s3, 10);        
+
+            s.columnDataAddBatch();
+            s.columnDataExecuteBatch();
+            s.columnDataCloseBatch();
+
+            String sql = "select * from weather_test";
+            PreparedStatement statement = conn.prepareStatement(sql);
+            ResultSet rs = statement.executeQuery();
+            int rows = 0;
+            while(rs.next()) {
+                rows++;
+            }
+            Assert.assertEquals(numOfRows, rows);            
+        }
+    }
+
+    @Test
+    public void bindDataWithSingleTagTest() throws SQLException { 
+        Statement stmt = conn.createStatement();                
+
+        String types[] = new String[] {"tinyint", "smallint", "int", "bigint", "bool", "float", "double", "binary(10)", "nchar(10)"};                
+
+        for (String type : types) {
+            stmt.execute("drop table if exists weather_test");
+            stmt.execute("create table weather_test(ts timestamp, f1 nchar(10), f2 binary(10)) tags (t " + type + ")");
+
+            int numOfRows = 1;
+    
+            TSDBPreparedStatement s = (TSDBPreparedStatement) conn.prepareStatement("insert into ? using weather_test tags(?) values(?, ?, ?)");
+            Random r = new Random();
+            s.setTableName("w1");
+            
+            switch(type) {
+                case "tinyint":
+                case "smallint":
+                case "int":
+                case "bigint":
+                    s.setTagInt(0, 1);
+                    break;
+                case "float":
+                    s.setTagFloat(0, 1.23f);
+                    break;
+                case "double":
+                    s.setTagDouble(0, 3.14159265);
+                    break;
+                case "bool":
+                    s.setTagBoolean(0, true);
+                    break;
+                case "binary(10)":
+                    s.setTagString(0, "test");
+                    break;
+                case "nchar(10)":
+                    s.setTagNString(0, "test");
+                    break;
+                default:
+                    break;
+            }
+            
+            
+            ArrayList<Long> ts = new ArrayList<Long>();
+            for(int i = 0; i < numOfRows; i++) {
+                ts.add(System.currentTimeMillis() + i);
+            }        
+            s.setTimestamp(0, ts);
+    
+            int random = 10 + r.nextInt(5);
+            ArrayList<String> s2 = new ArrayList<String>();        
+            for(int i = 0; i < numOfRows; i++) {            
+                s2.add("分支" + i % 4);            
+            }        
+            s.setNString(1, s2, 10);
+            
+            random = 10 + r.nextInt(5);
+            ArrayList<String> s3 = new ArrayList<String>();        
+            for(int i = 0; i < numOfRows; i++) {            
+                s3.add("test" + i % 4);            
+            }        
+            s.setString(2, s3, 10);
+    
+            s.columnDataAddBatch();
+            s.columnDataExecuteBatch();
+            s.columnDataCloseBatch();
+    
+            String sql = "select * from weather_test";
+            PreparedStatement statement = conn.prepareStatement(sql);
+            ResultSet rs = statement.executeQuery();
+            int rows = 0;
+            while(rs.next()) {
+                rows++;
+            }
+            Assert.assertEquals(numOfRows, rows);
+        }
+    }
+
+
+    @Test
+    public void bindDataWithMultipleTagsTest() throws SQLException { 
+        Statement stmt = conn.createStatement();                
+        
+        stmt.execute("drop table if exists weather_test");
+        stmt.execute("create table weather_test(ts timestamp, f1 nchar(10), f2 binary(10)) tags (t1 int, t2 binary(10))");
+
+        int numOfRows = 1;
+
+        TSDBPreparedStatement s = (TSDBPreparedStatement) conn.prepareStatement("insert into ? using weather_test tags(?,?) (ts, f2) values(?, ?)");        
+        s.setTableName("w2");  
+        s.setTagInt(0, 1);
+        s.setTagString(1, "test");
+        
+        
+        ArrayList<Long> ts = new ArrayList<Long>();
+        for(int i = 0; i < numOfRows; i++) {
+            ts.add(System.currentTimeMillis() + i);
+        }        
+        s.setTimestamp(0, ts);
+        
+        ArrayList<String> s2 = new ArrayList<String>();        
+        for(int i = 0; i < numOfRows; i++) {            
+            s2.add("test" + i % 4);
+        }
+        s.setString(1, s2, 10);
+    
+        s.columnDataAddBatch();
+        s.columnDataExecuteBatch();
+        s.columnDataCloseBatch();
+
+        String sql = "select * from weather_test";
+        PreparedStatement statement = conn.prepareStatement(sql);
+        ResultSet rs = statement.executeQuery();
+        int rows = 0;
+        while(rs.next()) {
+            rows++;
+        }
+        Assert.assertEquals(numOfRows, rows);
+        
+    }
     
     @Test
     public void createTwoSameDbTest() throws SQLException {
@@ -303,7 +595,7 @@ public class TSDBPreparedStatementTest {
         stmt.execute("create database dbtest");
         Assert.assertThrows(SQLException.class, () -> stmt.execute("create database dbtest"));                
     }
-
+    
     @Test
     public void setBoolean() throws SQLException {
         // given
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBResultSetTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBResultSetTest.java
index 31ee35899c57c074ac5a5012b542b9710d6816d4..ec54a44b7c889236676b65fea9fdf689b7207df9 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBResultSetTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBResultSetTest.java
@@ -177,7 +177,8 @@ public class TSDBResultSetTest {
         rs.getAsciiStream("f1");
     }
 
-    @Test(expected = SQLFeatureNotSupportedException.class)
+    @SuppressWarnings("deprecation")
+	@Test(expected = SQLFeatureNotSupportedException.class)
     public void getUnicodeStream() throws SQLException {
         rs.getUnicodeStream("f1");
     }
diff --git a/src/connector/python/taos/cinterface.py b/src/connector/python/taos/cinterface.py
index b8824327b017fc0bb7f9639942e20e72891ac808..0f690aeb27ce81d867d1727c50ba948afd9493a8 100644
--- a/src/connector/python/taos/cinterface.py
+++ b/src/connector/python/taos/cinterface.py
@@ -242,7 +242,7 @@ def _load_taos_linux():
 
 
 def _load_taos_darwin():
-    return ctypes.cDLL('libtaos.dylib')
+    return ctypes.CDLL('libtaos.dylib')
 
 
 def _load_taos_windows():
diff --git a/src/cq/src/cqMain.c b/src/cq/src/cqMain.c
index ee4be02b9004b56c0139b792393d00d9ea6a6f98..f539e7725315d2358767624ce74a8e9609a0b425 100644
--- a/src/cq/src/cqMain.c
+++ b/src/cq/src/cqMain.c
@@ -38,21 +38,6 @@
 #define cDebug(...) { if (cqDebugFlag & DEBUG_DEBUG) { taosPrintLog("CQ  ", cqDebugFlag, __VA_ARGS__); }}
 #define cTrace(...) { if (cqDebugFlag & DEBUG_TRACE) { taosPrintLog("CQ  ", cqDebugFlag, __VA_ARGS__); }}
 
-typedef struct {
-  int32_t  vgId;
-  int32_t  master;
-  int32_t  num;      // number of continuous streams
-  char     user[TSDB_USER_LEN];
-  char     pass[TSDB_KEY_LEN];
-  char     db[TSDB_DB_NAME_LEN];
-  FCqWrite cqWrite;
-  struct SCqObj *pHead;
-  void    *dbConn;
-  void    *tmrCtrl;
-  pthread_mutex_t mutex;
-  int32_t delete;
-  int32_t cqObjNum;
-} SCqContext;
 
 typedef struct SCqObj {
   tmr_h          tmrId;
@@ -439,7 +424,7 @@ static void cqProcessCreateTimer(void *param, void *tmrId) {
 
 // inner implement in tscStream.c
 TAOS_STREAM *taos_open_stream_withname(TAOS *taos, const char* desName, const char *sqlstr, void (*fp)(void *param, TAOS_RES *, TAOS_ROW row),
-                              int64_t stime, void *param, void (*callback)(void *));
+                              int64_t stime, void *param, void (*callback)(void *), void* cqhandle);
 
 static void cqCreateStream(SCqContext *pContext, SCqObj *pObj) {
   pObj->pContext = pContext;
@@ -453,7 +438,8 @@ static void cqCreateStream(SCqContext *pContext, SCqObj *pObj) {
   pObj->tmrId = 0;
 
   if (pObj->pStream == NULL) {
-    pObj->pStream = taos_open_stream_withname(pContext->dbConn, pObj->dstTable, pObj->sqlStr, cqProcessStreamRes, INT64_MIN, (void *)pObj->rid, NULL);
+    pObj->pStream = taos_open_stream_withname(pContext->dbConn, pObj->dstTable, pObj->sqlStr, cqProcessStreamRes, \
+                                               INT64_MIN, (void *)pObj->rid, NULL, pContext);
 
     // TODO the pObj->pStream may be released if error happens
     if (pObj->pStream) {
diff --git a/src/dnode/src/dnodeVMgmt.c b/src/dnode/src/dnodeVMgmt.c
index 66c94bf6755850f4b731e425cd0da90f75c218f3..ef99e70bd112494e4735b532396f925106cba5e2 100644
--- a/src/dnode/src/dnodeVMgmt.c
+++ b/src/dnode/src/dnodeVMgmt.c
@@ -154,7 +154,6 @@ static SCreateVnodeMsg* dnodeParseVnodeMsg(SRpcMsg *rpcMsg) {
 
 static int32_t dnodeProcessCreateVnodeMsg(SRpcMsg *rpcMsg) {
   SCreateVnodeMsg *pCreate = dnodeParseVnodeMsg(rpcMsg);
-
   void *pVnode = vnodeAcquire(pCreate->cfg.vgId);
   if (pVnode != NULL) {
     dDebug("vgId:%d, already exist, return success", pCreate->cfg.vgId);
diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h
index e6eec73681dbde6c4c5b18f7b7c0351d40f7d134..dac2dc84b6065d27514bbbbd2a836a81422408ad 100644
--- a/src/inc/taosdef.h
+++ b/src/inc/taosdef.h
@@ -166,7 +166,7 @@ do { \
 #define TSDB_BINARY_OP_REMAINDER  34
 
 
-#define IS_RELATION_OPTR(op) (((op) >= TSDB_RELATION_LESS) && ((op) <= TSDB_RELATION_IN))
+#define IS_RELATION_OPTR(op) (((op) >= TSDB_RELATION_LESS) && ((op) < TSDB_RELATION_IN))
 #define IS_ARITHMETIC_OPTR(op) (((op) >= TSDB_BINARY_OP_ADD) && ((op) <= TSDB_BINARY_OP_REMAINDER))
 
 #define TS_PATH_DELIMITER_LEN     1
diff --git a/src/inc/taosmsg.h b/src/inc/taosmsg.h
index 15b1da1dd31ea7df4a7772515e1dc8812aaddadb..c7fe64974898937669549599994ddc643ee4d9b0 100644
--- a/src/inc/taosmsg.h
+++ b/src/inc/taosmsg.h
@@ -548,7 +548,7 @@ typedef struct {
   int32_t  totalBlocks;
   int32_t  maxTables;
   int32_t  daysPerFile;
-  int32_t  daysToKeep;
+  int32_t  daysToKeep0;
   int32_t  daysToKeep1;
   int32_t  daysToKeep2;
   int32_t  minRowsPerFileBlock;
diff --git a/src/inc/tcq.h b/src/inc/tcq.h
index 552a40665ae10c72203ac60afaec59a4381ead5f..7549c3d498a02e948212c38b071701aa55adc2fc 100644
--- a/src/inc/tcq.h
+++ b/src/inc/tcq.h
@@ -31,6 +31,23 @@ typedef struct {
   FCqWrite cqWrite;
 } SCqCfg;
 
+// SCqContext
+typedef struct {
+  int32_t  vgId;
+  int32_t  master;
+  int32_t  num;      // number of continuous streams
+  char     user[TSDB_USER_LEN];
+  char     pass[TSDB_KEY_LEN];
+  char     db[TSDB_DB_NAME_LEN];
+  FCqWrite cqWrite;
+  struct SCqObj *pHead;
+  void    *dbConn;
+  void    *tmrCtrl;
+  pthread_mutex_t mutex;
+  int32_t delete;
+  int32_t cqObjNum;
+} SCqContext;
+
 // the following API shall be called by vnode
 void *cqOpen(void *ahandle, const SCqCfg *pCfg);
 void  cqClose(void *handle);
diff --git a/src/inc/tsdb.h b/src/inc/tsdb.h
index 05d29daad52c2eeeeee080b411ebedf4b7e8233f..79d9029dbc1603fe145e8b12553e2d03c028ac60 100644
--- a/src/inc/tsdb.h
+++ b/src/inc/tsdb.h
@@ -94,7 +94,7 @@ STsdbRepo *tsdbOpenRepo(STsdbCfg *pCfg, STsdbAppH *pAppH);
 int        tsdbCloseRepo(STsdbRepo *repo, int toCommit);
 int32_t    tsdbConfigRepo(STsdbRepo *repo, STsdbCfg *pCfg);
 int        tsdbGetState(STsdbRepo *repo);
-
+bool       tsdbInCompact(STsdbRepo *repo);
 // --------- TSDB TABLE DEFINITION
 typedef struct {
   uint64_t uid;  // the unique table ID
diff --git a/src/inc/ttokendef.h b/src/inc/ttokendef.h
index c7d630891b59e88af1360af67542dbe5ca601418..fb860137f3ee612a7bfb7966c2bb245b46a35fcd 100644
--- a/src/inc/ttokendef.h
+++ b/src/inc/ttokendef.h
@@ -104,28 +104,28 @@
 #define TK_QTIME                           85
 #define TK_CONNS                           86
 #define TK_STATE                           87
-#define TK_KEEP                            88
-#define TK_CACHE                           89
-#define TK_REPLICA                         90
-#define TK_QUORUM                          91
-#define TK_DAYS                            92
-#define TK_MINROWS                         93
-#define TK_MAXROWS                         94
-#define TK_BLOCKS                          95
-#define TK_CTIME                           96
-#define TK_WAL                             97
-#define TK_FSYNC                           98
-#define TK_COMP                            99
-#define TK_PRECISION                      100
-#define TK_UPDATE                         101
-#define TK_CACHELAST                      102
-#define TK_PARTITIONS                     103
-#define TK_LP                             104
-#define TK_RP                             105
-#define TK_UNSIGNED                       106
-#define TK_TAGS                           107
-#define TK_USING                          108
-#define TK_COMMA                          109
+#define TK_COMMA                           88
+#define TK_KEEP                            89
+#define TK_CACHE                           90
+#define TK_REPLICA                         91
+#define TK_QUORUM                          92
+#define TK_DAYS                            93
+#define TK_MINROWS                         94
+#define TK_MAXROWS                         95
+#define TK_BLOCKS                          96
+#define TK_CTIME                           97
+#define TK_WAL                             98
+#define TK_FSYNC                           99
+#define TK_COMP                           100
+#define TK_PRECISION                      101
+#define TK_UPDATE                         102
+#define TK_CACHELAST                      103
+#define TK_PARTITIONS                     104
+#define TK_LP                             105
+#define TK_RP                             106
+#define TK_UNSIGNED                       107
+#define TK_TAGS                           108
+#define TK_USING                          109
 #define TK_AS                             110
 #define TK_NULL                           111
 #define TK_SELECT                         112
@@ -212,7 +212,6 @@
 
 
 
-
 #define TK_SPACE                          300
 #define TK_COMMENT                        301
 #define TK_ILLEGAL                        302
diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c
index d4176fca91cd412b4d2d20a9a6c72a998c443428..d5fa0a9e09f5ac10d4d6a64c48d4639697c49165 100644
--- a/src/kit/shell/src/shellEngine.c
+++ b/src/kit/shell/src/shellEngine.c
@@ -398,7 +398,10 @@ static char* formatTimestamp(char* buf, int64_t val, int precision) {
 
   time_t tt;
   int32_t ms = 0;
-  if (precision == TSDB_TIME_PRECISION_MICRO) {
+  if (precision == TSDB_TIME_PRECISION_NANO) {
+    tt = (time_t)(val / 1000000000);
+    ms = val % 1000000000;
+  } else if (precision == TSDB_TIME_PRECISION_MICRO) {
     tt = (time_t)(val / 1000000);
     ms = val % 1000000;
   } else {
@@ -419,7 +422,9 @@ static char* formatTimestamp(char* buf, int64_t val, int precision) {
 #endif
   if (tt <= 0 && ms < 0) {
     tt--;
-    if (precision == TSDB_TIME_PRECISION_MICRO) {
+    if (precision == TSDB_TIME_PRECISION_NANO) {
+      ms += 1000000000;
+    } else if (precision == TSDB_TIME_PRECISION_MICRO) {
       ms += 1000000;
     } else {
       ms += 1000;
@@ -427,9 +432,11 @@ static char* formatTimestamp(char* buf, int64_t val, int precision) {
   }
 
   struct tm* ptm = localtime(&tt);
-  size_t pos = strftime(buf, 32, "%Y-%m-%d %H:%M:%S", ptm);
+  size_t pos = strftime(buf, 35, "%Y-%m-%d %H:%M:%S", ptm);
 
-  if (precision == TSDB_TIME_PRECISION_MICRO) {
+  if (precision == TSDB_TIME_PRECISION_NANO) {
+    sprintf(buf + pos, ".%09d", ms);
+  } else if (precision == TSDB_TIME_PRECISION_MICRO) {
     sprintf(buf + pos, ".%06d", ms);
   } else {
     sprintf(buf + pos, ".%03d", ms);
@@ -778,6 +785,8 @@ static int calcColWidth(TAOS_FIELD* field, int precision) {
     case TSDB_DATA_TYPE_TIMESTAMP:
       if (args.is_raw_time) {
         return MAX(14, width);
+      } if (precision == TSDB_TIME_PRECISION_NANO) {
+        return MAX(29, width);
       } else if (precision == TSDB_TIME_PRECISION_MICRO) {
         return MAX(26, width); // '2020-01-01 00:00:00.000000'
       } else {
diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index 6f5d407a7348b2fa7768f0266c5dcd79a6b4653f..865224d2c3f513edcd8308731baf096cc697ea83 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -625,6 +625,10 @@ static int64_t         g_totalChildTables = 0;
 static SQueryMetaInfo  g_queryInfo;
 static FILE *          g_fpOfInsertResult = NULL;
 
+#if _MSC_VER <= 1900
+#define __func__ __FUNCTION__
+#endif
+
 #define debugPrint(fmt, ...) \
     do { if (g_args.debug_print || g_args.verbose_print) \
       fprintf(stderr, "DEBG: "fmt, __VA_ARGS__); } while(0)
@@ -1209,7 +1213,6 @@ static void fetchResult(TAOS_RES *res, threadInfo* pThreadInfo) {
   }
 
   int   totalLen = 0;
-  char  temp[16000];
 
   // fetch the records row by row
   while((row = taos_fetch_row(res))) {
@@ -1220,6 +1223,7 @@ static void fetchResult(TAOS_RES *res, threadInfo* pThreadInfo) {
         memset(databuf, 0, 100*1024*1024);
     }
     num_rows++;
+    char temp[16000] = {0};
     int len = taos_print_row(temp, row, fields, num_fields);
     len += sprintf(temp + len, "\n");
     //printf("query result:%s\n", temp);
@@ -1848,7 +1852,9 @@ static void printfQueryMeta() {
 
 static char* formatTimestamp(char* buf, int64_t val, int precision) {
   time_t tt;
-  if (precision == TSDB_TIME_PRECISION_MICRO) {
+  if (precision == TSDB_TIME_PRECISION_NANO) {
+    tt = (time_t)(val / 1000000000);
+  } else if (precision == TSDB_TIME_PRECISION_MICRO) {
     tt = (time_t)(val / 1000000);
   } else {
     tt = (time_t)(val / 1000);
@@ -1869,7 +1875,9 @@ static char* formatTimestamp(char* buf, int64_t val, int precision) {
   struct tm* ptm = localtime(&tt);
   size_t pos = strftime(buf, 32, "%Y-%m-%d %H:%M:%S", ptm);
 
-  if (precision == TSDB_TIME_PRECISION_MICRO) {
+  if (precision == TSDB_TIME_PRECISION_NANO) {
+    sprintf(buf + pos, ".%09d", (int)(val % 1000000000));
+  } else if (precision == TSDB_TIME_PRECISION_MICRO) {
     sprintf(buf + pos, ".%06d", (int)(val % 1000000));
   } else {
     sprintf(buf + pos, ".%03d", (int)(val % 1000));
@@ -6249,9 +6257,11 @@ static void startMultiThreadInsertData(int threads, char* db_name,
   if (0 != precision[0]) {
     if (0 == strncasecmp(precision, "ms", 2)) {
       timePrec = TSDB_TIME_PRECISION_MILLI;
-    }  else if (0 == strncasecmp(precision, "us", 2)) {
+    } else if (0 == strncasecmp(precision, "us", 2)) {
       timePrec = TSDB_TIME_PRECISION_MICRO;
-    }  else {
+    } else if (0 == strncasecmp(precision, "ns", 2)) {
+      timePrec = TSDB_TIME_PRECISION_NANO;
+    } else {
       errorPrint("Not support precision: %s\n", precision);
       exit(-1);
     }
diff --git a/src/mnode/inc/mnodeDb.h b/src/mnode/inc/mnodeDb.h
index 0fa1a15e2d7531d941f6236517385d1e97922c6e..40c5afc2c84cd497095a508df42b9e89ad638d70 100644
--- a/src/mnode/inc/mnodeDb.h
+++ b/src/mnode/inc/mnodeDb.h
@@ -40,6 +40,7 @@ void    mnodeIncDbRef(SDbObj *pDb);
 void    mnodeDecDbRef(SDbObj *pDb);
 bool    mnodeCheckIsMonitorDB(char *db, char *monitordb);
 void    mnodeDropAllDbs(SAcctObj *pAcct);
+int     mnodeInsertAlterDbRow(SDbObj *pDb, void *pMsg);
 
 int32_t mnodeCompactDbs();
 
diff --git a/src/mnode/inc/mnodeDef.h b/src/mnode/inc/mnodeDef.h
index e052f34a33b2a74dcd858721694225859f1581b8..0d64f42a98f660fe43bd9121a718a880a621c97c 100644
--- a/src/mnode/inc/mnodeDef.h
+++ b/src/mnode/inc/mnodeDef.h
@@ -48,9 +48,8 @@ typedef struct SDnodeObj {
   int32_t    dnodeId;
   int32_t    openVnodes;
   int64_t    createdTime;
-  int32_t    resever0;         // from dnode status msg, config information
+  int64_t    lastAccess;
   int32_t    customScore;      // config by user
-  uint32_t   lastAccess;
   uint16_t   numOfCores;       // from dnode status msg
   uint16_t   dnodePort;
   char       dnodeFqdn[TSDB_FQDN_LEN];
@@ -161,7 +160,7 @@ typedef struct {
   int32_t totalBlocks;
   int32_t maxTables;
   int32_t daysPerFile;
-  int32_t daysToKeep;
+  int32_t daysToKeep0;
   int32_t daysToKeep1;
   int32_t daysToKeep2;
   int32_t minRowsPerFileBlock;
diff --git a/src/mnode/inc/mnodeDnode.h b/src/mnode/inc/mnodeDnode.h
index 2db794a173894a325dda5e2444b8a49729c445ac..10f79582d4a492622e1cc425d69aaa95966846d7 100644
--- a/src/mnode/inc/mnodeDnode.h
+++ b/src/mnode/inc/mnodeDnode.h
@@ -78,7 +78,7 @@ void    mnodeUpdateDnode(SDnodeObj *pDnode);
 int32_t mnodeDropDnode(SDnodeObj *pDnode, void *pMsg);
 
 int32_t mnodeCompactDnodes();
-extern int32_t tsAccessSquence;
+extern int64_t tsAccessSquence;
 
 #ifdef __cplusplus
 }
diff --git a/src/mnode/inc/mnodeVgroup.h b/src/mnode/inc/mnodeVgroup.h
index 73b0e6ae1bb2e05876deb2486db7c5d1cb25e65b..c796365843ae257324af3633e1340c9d044413ab 100644
--- a/src/mnode/inc/mnodeVgroup.h
+++ b/src/mnode/inc/mnodeVgroup.h
@@ -49,7 +49,7 @@ int32_t mnodeAddTableIntoVgroup(SVgObj *pVgroup, SCTableObj *pTable, bool needCh
 void    mnodeRemoveTableFromVgroup(SVgObj *pVgroup, SCTableObj *pTable);
 void    mnodeSendDropVnodeMsg(int32_t vgId, SRpcEpSet *epSet, void *ahandle);
 void    mnodeSendCreateVgroupMsg(SVgObj *pVgroup, void *ahandle);
-void    mnodeSendAlterVgroupMsg(SVgObj *pVgroup);
+void    mnodeSendAlterVgroupMsg(SVgObj *pVgroup,SMnodeMsg *pMsg);
 void    mnodeSendSyncVgroupMsg(SVgObj *pVgroup);
 
 SRpcEpSet mnodeGetEpSetFromVgroup(SVgObj *pVgroup);
diff --git a/src/mnode/src/mnodeDb.c b/src/mnode/src/mnodeDb.c
index b0ac1192bb8a5545c1e8f731fb92a0d69538eb18..334450f70b5125fcc57722c12cc1694b40eb166d 100644
--- a/src/mnode/src/mnodeDb.c
+++ b/src/mnode/src/mnodeDb.c
@@ -24,12 +24,14 @@
 #include "tdataformat.h"
 #include "tp.h"
 #include "mnode.h"
+#include "dnode.h"
 #include "mnodeDef.h"
 #include "mnodeInt.h"
 #include "mnodeAcct.h"
 #include "mnodeDb.h"
 #include "mnodeDnode.h"
 #include "mnodeMnode.h"
+#include "mnodePeer.h"
 #include "mnodeProfile.h"
 #include "mnodeWrite.h"
 #include "mnodeSdb.h"
@@ -261,26 +263,27 @@ static int32_t mnodeCheckDbCfg(SDbCfg *pCfg) {
     return TSDB_CODE_MND_INVALID_DB_OPTION_DAYS;
   }
 
-  if (pCfg->daysToKeep < TSDB_MIN_KEEP || pCfg->daysToKeep > TSDB_MAX_KEEP) {
-    mError("invalid db option daysToKeep:%d valid range: [%d, %d]", pCfg->daysToKeep, TSDB_MIN_KEEP, TSDB_MAX_KEEP);
+  if (pCfg->daysToKeep0 < TSDB_MIN_KEEP || pCfg->daysToKeep0 > TSDB_MAX_KEEP) {
+    mError("invalid db option daysToKeep:%d valid range: [%d, %d]", pCfg->daysToKeep0, TSDB_MIN_KEEP, TSDB_MAX_KEEP);
     return TSDB_CODE_MND_INVALID_DB_OPTION_KEEP;
   }
 
-  if (pCfg->daysToKeep < pCfg->daysPerFile) {
-    mError("invalid db option daysToKeep:%d should larger than daysPerFile:%d", pCfg->daysToKeep, pCfg->daysPerFile);
+  if (pCfg->daysToKeep0 < pCfg->daysPerFile) {
+    mError("invalid db option daysToKeep:%d should larger than daysPerFile:%d", pCfg->daysToKeep0, pCfg->daysPerFile);
     return TSDB_CODE_MND_INVALID_DB_OPTION_KEEP;
   }
 
-  if (pCfg->daysToKeep2 < TSDB_MIN_KEEP || pCfg->daysToKeep2 > pCfg->daysToKeep) {
-    mError("invalid db option daysToKeep2:%d valid range: [%d, %d]", pCfg->daysToKeep2, TSDB_MIN_KEEP, pCfg->daysToKeep);
+  if (pCfg->daysToKeep1 < pCfg->daysToKeep0 || pCfg->daysToKeep1 > TSDB_MAX_KEEP) {
+    mError("invalid db option daysToKeep1:%d valid range: [%d, %d]", pCfg->daysToKeep1, pCfg->daysToKeep0, TSDB_MAX_KEEP);
     return TSDB_CODE_MND_INVALID_DB_OPTION_KEEP;
   }
 
-  if (pCfg->daysToKeep1 < TSDB_MIN_KEEP || pCfg->daysToKeep1 > pCfg->daysToKeep2) {
-    mError("invalid db option daysToKeep1:%d valid range: [%d, %d]", pCfg->daysToKeep1, TSDB_MIN_KEEP, pCfg->daysToKeep2);
+  if (pCfg->daysToKeep2 < pCfg->daysToKeep1 || pCfg->daysToKeep2 > TSDB_MAX_KEEP) {
+    mError("invalid db option daysToKeep2:%d valid range: [%d, %d]", pCfg->daysToKeep2, pCfg->daysToKeep1, TSDB_MAX_KEEP);
     return TSDB_CODE_MND_INVALID_DB_OPTION_KEEP;
   }
 
+
   if (pCfg->maxRowsPerFileBlock < TSDB_MIN_MAX_ROW_FBLOCK || pCfg->maxRowsPerFileBlock > TSDB_MAX_MAX_ROW_FBLOCK) {
     mError("invalid db option maxRowsPerFileBlock:%d valid range: [%d, %d]", pCfg->maxRowsPerFileBlock,
            TSDB_MIN_MAX_ROW_FBLOCK, TSDB_MAX_MAX_ROW_FBLOCK);
@@ -378,9 +381,9 @@ static void mnodeSetDefaultDbCfg(SDbCfg *pCfg) {
   if (pCfg->totalBlocks < 0) pCfg->totalBlocks = tsBlocksPerVnode;
   if (pCfg->maxTables < 0) pCfg->maxTables = tsMaxTablePerVnode;
   if (pCfg->daysPerFile < 0) pCfg->daysPerFile = tsDaysPerFile;
-  if (pCfg->daysToKeep < 0) pCfg->daysToKeep = tsDaysToKeep;
-  if (pCfg->daysToKeep1 < 0) pCfg->daysToKeep1 = pCfg->daysToKeep;
-  if (pCfg->daysToKeep2 < 0) pCfg->daysToKeep2 = pCfg->daysToKeep;
+  if (pCfg->daysToKeep2 < 0) pCfg->daysToKeep2 = tsDaysToKeep;
+  if (pCfg->daysToKeep1 < 0) pCfg->daysToKeep1 = pCfg->daysToKeep2;
+  if (pCfg->daysToKeep0 < 0) pCfg->daysToKeep0 = pCfg->daysToKeep1;
   if (pCfg->minRowsPerFileBlock < 0) pCfg->minRowsPerFileBlock = tsMinRowsInFileBlock;
   if (pCfg->maxRowsPerFileBlock < 0) pCfg->maxRowsPerFileBlock = tsMaxRowsInFileBlock;
   if (pCfg->fsyncPeriod <0) pCfg->fsyncPeriod = tsFsyncPeriod;
@@ -435,7 +438,7 @@ static int32_t mnodeCreateDb(SAcctObj *pAcct, SCreateDbMsg *pCreate, SMnodeMsg *
     .totalBlocks         = pCreate->totalBlocks,
     .maxTables           = pCreate->maxTables,
     .daysPerFile         = pCreate->daysPerFile,
-    .daysToKeep          = pCreate->daysToKeep,
+    .daysToKeep0         = pCreate->daysToKeep0,
     .daysToKeep1         = pCreate->daysToKeep1,
     .daysToKeep2         = pCreate->daysToKeep2,
     .minRowsPerFileBlock = pCreate->minRowsPerFileBlock,
@@ -611,7 +614,12 @@ static int32_t mnodeGetDbMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn
 
   pShow->bytes[cols] = 24 + VARSTR_HEADER_SIZE;
   pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "keep0,keep1,keep(D)");
+
+#ifdef _STORAGE  
+  strcpy(pSchema[cols].name, "keep0,keep1,keep2");
+#else
+  strcpy(pSchema[cols].name, "keep");
+#endif
   pSchema[cols].bytes = htons(pShow->bytes[cols]);
   cols++;
 
@@ -777,7 +785,15 @@ static int32_t mnodeRetrieveDbs(SShowObj *pShow, char *data, int32_t rows, void
     pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
     
     char tmp[128] = {0};
-    sprintf(tmp, "%d,%d,%d", pDb->cfg.daysToKeep1, pDb->cfg.daysToKeep2, pDb->cfg.daysToKeep);
+#ifdef _STORAGE      
+    if (pDb->cfg.daysToKeep0 > pDb->cfg.daysToKeep1 || pDb->cfg.daysToKeep0 > pDb->cfg.daysToKeep2) { 
+      sprintf(tmp, "%d,%d,%d", pDb->cfg.daysToKeep1, pDb->cfg.daysToKeep2, pDb->cfg.daysToKeep0);
+    } else {
+      sprintf(tmp, "%d,%d,%d", pDb->cfg.daysToKeep0, pDb->cfg.daysToKeep1, pDb->cfg.daysToKeep2);
+    }
+#else
+    sprintf(tmp, "%d", pDb->cfg.daysToKeep2);
+#endif
     STR_WITH_SIZE_TO_VARSTR(pWrite, tmp, strlen(tmp));
     cols++;
 
@@ -820,8 +836,13 @@ static int32_t mnodeRetrieveDbs(SShowObj *pShow, char *data, int32_t rows, void
 #endif
 
     pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    char *prec = (pDb->cfg.precision == TSDB_TIME_PRECISION_MILLI) ? TSDB_TIME_PRECISION_MILLI_STR
-                                                                   : TSDB_TIME_PRECISION_MICRO_STR;
+    char *prec = NULL;
+    switch (pDb->cfg.precision) {
+      case TSDB_TIME_PRECISION_MILLI: prec = TSDB_TIME_PRECISION_MILLI_STR; break;
+      case TSDB_TIME_PRECISION_MICRO: prec = TSDB_TIME_PRECISION_MICRO_STR; break;
+      case TSDB_TIME_PRECISION_NANO:  prec = TSDB_TIME_PRECISION_NANO_STR;  break;
+      default: assert(false); break;
+    }
     STR_WITH_SIZE_TO_VARSTR(pWrite, prec, 2);
     cols++;
 
@@ -890,7 +911,7 @@ static int32_t mnodeProcessCreateDbMsg(SMnodeMsg *pMsg) {
   pCreate->cacheBlockSize  = htonl(pCreate->cacheBlockSize);
   pCreate->totalBlocks     = htonl(pCreate->totalBlocks);
   pCreate->daysPerFile     = htonl(pCreate->daysPerFile);
-  pCreate->daysToKeep      = htonl(pCreate->daysToKeep);
+  pCreate->daysToKeep0     = htonl(pCreate->daysToKeep0);
   pCreate->daysToKeep1     = htonl(pCreate->daysToKeep1);
   pCreate->daysToKeep2     = htonl(pCreate->daysToKeep2);
   pCreate->commitTime      = htonl(pCreate->commitTime);
@@ -917,7 +938,7 @@ static SDbCfg mnodeGetAlterDbOption(SDbObj *pDb, SAlterDbMsg *pAlter) {
   int32_t cacheBlockSize = htonl(pAlter->cacheBlockSize);
   int32_t totalBlocks    = htonl(pAlter->totalBlocks);
   int32_t daysPerFile    = htonl(pAlter->daysPerFile);
-  int32_t daysToKeep     = htonl(pAlter->daysToKeep);
+  int32_t daysToKeep0    = htonl(pAlter->daysToKeep0);
   int32_t daysToKeep1    = htonl(pAlter->daysToKeep1);
   int32_t daysToKeep2    = htonl(pAlter->daysToKeep2);
   int32_t minRows        = htonl(pAlter->minRowsPerFileBlock);
@@ -936,6 +957,14 @@ static SDbCfg mnodeGetAlterDbOption(SDbObj *pDb, SAlterDbMsg *pAlter) {
   
   terrno = TSDB_CODE_SUCCESS;
 
+  //UPGRATE FROM LOW VERSION, reorder it
+  if (pDb->cfg.daysToKeep0 > pDb->cfg.daysToKeep1 || pDb->cfg.daysToKeep0 > pDb->cfg.daysToKeep2) {
+    int32_t t = pDb->cfg.daysToKeep0;
+    newCfg.daysToKeep0 = pDb->cfg.daysToKeep1;
+    newCfg.daysToKeep1 = pDb->cfg.daysToKeep2;
+    newCfg.daysToKeep2 = t;
+  }
+
   if (cacheBlockSize > 0 && cacheBlockSize != pDb->cfg.cacheBlockSize) {
     mError("db:%s, can't alter cache option", pDb->name);
     terrno = TSDB_CODE_MND_INVALID_DB_OPTION;
@@ -960,17 +989,17 @@ static SDbCfg mnodeGetAlterDbOption(SDbObj *pDb, SAlterDbMsg *pAlter) {
     terrno = TSDB_CODE_MND_INVALID_DB_OPTION;
   }
 
-  if (daysToKeep > 0 && daysToKeep != pDb->cfg.daysToKeep) {
-    mDebug("db:%s, daysToKeep:%d change to %d", pDb->name, pDb->cfg.daysToKeep, daysToKeep);
-    newCfg.daysToKeep = daysToKeep;
+  if (daysToKeep0 > 0 && (daysToKeep0 != pDb->cfg.daysToKeep0 || newCfg.daysToKeep0 != pDb->cfg.daysToKeep0)) {
+    mDebug("db:%s, daysToKeep:%d change to %d", pDb->name, pDb->cfg.daysToKeep0, daysToKeep0);
+    newCfg.daysToKeep0 = daysToKeep0;
   }
 
-  if (daysToKeep1 > 0 && daysToKeep1 != pDb->cfg.daysToKeep1) {
+  if (daysToKeep1 > 0 && (daysToKeep1 != pDb->cfg.daysToKeep1 || newCfg.daysToKeep1 != pDb->cfg.daysToKeep1)) {
     mDebug("db:%s, daysToKeep1:%d change to %d", pDb->name, pDb->cfg.daysToKeep1, daysToKeep1);
     newCfg.daysToKeep1 = daysToKeep1;
   }
 
-  if (daysToKeep2 > 0 && daysToKeep2 != pDb->cfg.daysToKeep2) {
+  if (daysToKeep2 > 0 && (daysToKeep2 != pDb->cfg.daysToKeep2 || newCfg.daysToKeep2 != pDb->cfg.daysToKeep2)) {
     mDebug("db:%s, daysToKeep2:%d change to %d", pDb->name, pDb->cfg.daysToKeep2, daysToKeep2);
     newCfg.daysToKeep2 = daysToKeep2;
   }
@@ -1063,24 +1092,25 @@ static SDbCfg mnodeGetAlterDbOption(SDbObj *pDb, SAlterDbMsg *pAlter) {
 // community version can only change daysToKeep
 // but enterprise version can change all daysToKeep options
 #ifndef _STORAGE
-  newCfg.daysToKeep1 = newCfg.daysToKeep;
-  newCfg.daysToKeep2 = newCfg.daysToKeep;
+  newCfg.daysToKeep1 = newCfg.daysToKeep0;
+  newCfg.daysToKeep2 = newCfg.daysToKeep0;
 #endif
 
   return newCfg;
 }
 
-static int32_t mnodeAlterDbCb(SMnodeMsg *pMsg, int32_t code) {
-  if (code != TSDB_CODE_SUCCESS) return code;
+static int32_t mnodeAlterDbFp(SMnodeMsg *pMsg) {
   SDbObj *pDb = pMsg->pDb;
 
   void *pIter = NULL;
   SVgObj *pVgroup = NULL;
-    while (1) {
+  pMsg->expected = 0;
+  while (1) {
     pIter = mnodeGetNextVgroup(pIter, &pVgroup);
     if (pVgroup == NULL) break;
     if (pVgroup->pDb == pDb) {
-      mnodeSendAlterVgroupMsg(pVgroup);
+      pMsg->expected += pVgroup->numOfVnodes;
+      mnodeSendAlterVgroupMsg(pVgroup,pMsg);
     }
     mnodeDecVgroupRef(pVgroup);
   }
@@ -1088,9 +1118,32 @@ static int32_t mnodeAlterDbCb(SMnodeMsg *pMsg, int32_t code) {
   mDebug("db:%s, all vgroups is altered", pDb->name);
   mLInfo("db:%s, is alterd by %s", pDb->name, mnodeGetUserFromMsg(pMsg));
 
-  bnNotify();
+  // in case there is no vnode for this db currently(no table in db,etc.)
+  if (pMsg->expected == 0) {
+    SSdbRow row = {
+      .type    = SDB_OPER_GLOBAL,
+      .pTable  = tsDbSdb,
+      .pObj    = pDb,
+      .pMsg    = pMsg,
+    };
+
+    return sdbUpdateRow(&row);
+  }
 
-  return TSDB_CODE_SUCCESS;
+  //bnNotify();
+
+  return TSDB_CODE_MND_ACTION_IN_PROGRESS;
+}
+
+int mnodeInsertAlterDbRow(SDbObj *pDb, void *pMsg) {
+  SSdbRow desc = {
+    .type    = SDB_OPER_GLOBAL,
+    .pTable  = tsDbSdb,
+    .pObj    = pDb,
+    .pMsg    = pMsg,
+  };
+
+  return sdbUpdateRow(&desc);
 }
 
 static int32_t mnodeAlterDb(SDbObj *pDb, SAlterDbMsg *pAlter, void *pMsg) {
@@ -1114,14 +1167,14 @@ static int32_t mnodeAlterDb(SDbObj *pDb, SAlterDbMsg *pAlter, void *pMsg) {
       .pTable  = tsDbSdb,
       .pObj    = pDb,
       .pMsg    = pMsg,
-      .fpRsp   = mnodeAlterDbCb
+      .fpReq   = mnodeAlterDbFp
     };
 
     code = sdbUpdateRow(&row);
     if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
       mError("db:%s, failed to alter, reason:%s", pDb->name, tstrerror(code));
     }
-  }
+}
 
   return code;
 }
@@ -1304,4 +1357,4 @@ int32_t mnodeCompactDbs() {
   mInfo("end to compact dbs table...");
 
   return 0; 
-}
\ No newline at end of file
+}
diff --git a/src/mnode/src/mnodeDnode.c b/src/mnode/src/mnodeDnode.c
index 76144b53f9ffa0cb5f1ac48c8fc19a52808275af..a087b076a59e8b7f849d6d97b7f8e4e6283f7756 100644
--- a/src/mnode/src/mnodeDnode.c
+++ b/src/mnode/src/mnodeDnode.c
@@ -39,8 +39,8 @@
 #include "mnodePeer.h"
 #include "mnodeCluster.h"
 
-int32_t tsAccessSquence = 0;
-int64_t         tsDnodeRid = -1;
+int64_t        tsAccessSquence = 0;
+int64_t        tsDnodeRid = -1;
 static void *  tsDnodeSdb = NULL;
 static int32_t tsDnodeUpdateSize = 0;
 extern void *  tsMnodeSdb;
@@ -567,7 +567,7 @@ static int32_t mnodeProcessDnodeStatusMsg(SMnodeMsg *pMsg) {
              mnodeGetClusterId());
       return TSDB_CODE_MND_INVALID_CLUSTER_ID;
     } else {
-      mTrace("dnode:%d, status received, access times %d openVnodes:%d:%d", pDnode->dnodeId, pDnode->lastAccess,
+      mTrace("dnode:%d, status received, access times %" PRId64 " openVnodes:%d:%d", pDnode->dnodeId, pDnode->lastAccess,
              htons(pStatus->openVnodes), pDnode->openVnodes);
     }
   }
@@ -629,9 +629,9 @@ static int32_t mnodeProcessDnodeStatusMsg(SMnodeMsg *pMsg) {
     bnNotify();
   }
 
-  if (!tsEnableBalance) {
-    int32_t numOfMnodes = mnodeGetMnodesNum();
-    if (numOfMnodes < tsNumOfMnodes) bnNotify();
+  int32_t numOfMnodes = mnodeGetMnodesNum();
+  if (numOfMnodes < tsNumOfMnodes && numOfMnodes < mnodeGetOnlineDnodesNum() && !pDnode->isMgmt) {
+    bnNotify();
   }
 
   if (openVnodes != pDnode->openVnodes) {
diff --git a/src/mnode/src/mnodeSdb.c b/src/mnode/src/mnodeSdb.c
index a8bcdfa59e6c5c4d75f8478989600aa6d7677baf..1c1252177eb9cdffaec40e0e0625062eec4bfa67 100644
--- a/src/mnode/src/mnodeSdb.c
+++ b/src/mnode/src/mnodeSdb.c
@@ -670,10 +670,17 @@ static int32_t sdbProcessWrite(void *wparam, void *hparam, int32_t qtype, void *
                pTable->name, actStr[action], sdbGetKeyStr(pTable, pHead->cont), qtype, pHead->version, tsSdbMgmt.version);
       return TSDB_CODE_SUCCESS;
     } else if (pHead->version != tsSdbMgmt.version + 1) {
-      pthread_mutex_unlock(&tsSdbMgmt.mutex);
-      sdbError("vgId:1, sdb:%s, failed to restore %s key:%s from source(%d), hver:%" PRIu64 " too large, mver:%" PRIu64,
-               pTable->name, actStr[action], sdbGetKeyStr(pTable, pHead->cont), qtype, pHead->version, tsSdbMgmt.version);
-      return TSDB_CODE_SYN_INVALID_VERSION;
+      if (qtype != TAOS_QTYPE_WAL) {
+        pthread_mutex_unlock(&tsSdbMgmt.mutex);
+        sdbError(
+            "vgId:1, sdb:%s, failed to restore %s key:%s from source(%d), hver:%" PRIu64 " too large, mver:%" PRIu64,
+            pTable->name, actStr[action], sdbGetKeyStr(pTable, pHead->cont), qtype, pHead->version, tsSdbMgmt.version);
+        return TSDB_CODE_SYN_INVALID_VERSION;
+      } else {
+        // If cksum is wrong when recovering wal, use this code
+        tsSdbMgmt.version = pHead->version;
+      }
+
     } else {
       tsSdbMgmt.version = pHead->version;
     }
diff --git a/src/mnode/src/mnodeTable.c b/src/mnode/src/mnodeTable.c
index be53d353c9cd5b16b91b4d33650d340f25c939af..a225c0d9389fecb511229e12ae6733d0972df1b3 100644
--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
@@ -1501,7 +1501,7 @@ static int32_t mnodeChangeSuperTableTag(SMnodeMsg *pMsg) {
   }
 
   // update
-  SSchema *schema = (SSchema *) (pStable->schema + col);
+  SSchema *schema = (SSchema *) (pStable->schema + col + pStable->numOfColumns);
   ASSERT(schema->type == TSDB_DATA_TYPE_BINARY || schema->type == TSDB_DATA_TYPE_NCHAR);
   schema->bytes = pAlter->schema[0].bytes;
   mInfo("msg:%p, app:%p stable %s, start to modify tag len %s to %d", pMsg, pMsg->rpcMsg.ahandle, pStable->info.tableId,
diff --git a/src/mnode/src/mnodeVgroup.c b/src/mnode/src/mnodeVgroup.c
index a64d2564841241c7f49b7da82a48b51d27783c1a..af816d7ae74b0ed16b43b64ffac997daefc9b20d 100644
--- a/src/mnode/src/mnodeVgroup.c
+++ b/src/mnode/src/mnodeVgroup.c
@@ -60,7 +60,6 @@ static int32_t mnodeGetVgroupMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *p
 static int32_t mnodeRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, void *pConn);
 static void    mnodeProcessCreateVnodeRsp(SRpcMsg *rpcMsg);
 static void    mnodeProcessAlterVnodeRsp(SRpcMsg *rpcMsg);
-static void    mnodeProcessSyncVnodeRsp(SRpcMsg *rpcMsg);
 static void    mnodeProcessDropVnodeRsp(SRpcMsg *rpcMsg);
 static int32_t mnodeProcessVnodeCfgMsg(SMnodeMsg *pMsg) ;
 static void    mnodeSendDropVgroupMsg(SVgObj *pVgroup, void *ahandle);
@@ -237,7 +236,6 @@ int32_t mnodeInitVgroups() {
   mnodeAddShowFreeIterHandle(TSDB_MGMT_TABLE_VGROUP, mnodeCancelGetNextVgroup);
   mnodeAddPeerRspHandle(TSDB_MSG_TYPE_MD_CREATE_VNODE_RSP, mnodeProcessCreateVnodeRsp);
   mnodeAddPeerRspHandle(TSDB_MSG_TYPE_MD_ALTER_VNODE_RSP, mnodeProcessAlterVnodeRsp);
-  mnodeAddPeerRspHandle(TSDB_MSG_TYPE_MD_ALTER_VNODE_RSP, mnodeProcessSyncVnodeRsp);
   mnodeAddPeerRspHandle(TSDB_MSG_TYPE_MD_DROP_VNODE_RSP, mnodeProcessDropVnodeRsp);
   mnodeAddPeerMsgHandle(TSDB_MSG_TYPE_DM_CONFIG_VNODE, mnodeProcessVnodeCfgMsg);
 
@@ -271,7 +269,7 @@ void mnodeUpdateVgroup(SVgObj *pVgroup) {
   if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
     mError("vgId:%d, failed to update vgroup", pVgroup->vgId);
   }
-  mnodeSendAlterVgroupMsg(pVgroup);
+  mnodeSendAlterVgroupMsg(pVgroup,NULL);
 }
 
 /*
@@ -350,7 +348,7 @@ void mnodeUpdateVgroupStatus(SVgObj *pVgroup, SDnodeObj *pDnode, SVnodeLoad *pVl
     mError("dnode:%d, vgId:%d, vnode cfgVersion:%d:%d repica:%d not match with mnode cfgVersion:%d:%d replica:%d",
            pDnode->dnodeId, pVload->vgId, pVload->dbCfgVersion, pVload->vgCfgVersion, pVload->replica,
            pVgroup->pDb->dbCfgVersion, pVgroup->vgCfgVersion, pVgroup->numOfVnodes);
-    mnodeSendAlterVgroupMsg(pVgroup);
+    mnodeSendAlterVgroupMsg(pVgroup,NULL);
   }
 }
 
@@ -894,9 +892,9 @@ static SCreateVnodeMsg *mnodeBuildVnodeMsg(SVgObj *pVgroup) {
   pCfg->totalBlocks         = htonl(pDb->cfg.totalBlocks);
   pCfg->maxTables           = htonl(maxTables + 1);
   pCfg->daysPerFile         = htonl(pDb->cfg.daysPerFile);
-  pCfg->daysToKeep          = htonl(pDb->cfg.daysToKeep);
-  pCfg->daysToKeep1         = htonl(pDb->cfg.daysToKeep1);
-  pCfg->daysToKeep2         = htonl(pDb->cfg.daysToKeep2);  
+  pCfg->daysToKeep          = htonl(pDb->cfg.daysToKeep2);        //FROM DB TO VNODE MAP:
+  pCfg->daysToKeep1         = htonl(pDb->cfg.daysToKeep0);        //keep0,keep1,keep2 in SQL is mapped to keep1,keep2,keep in vnode
+  pCfg->daysToKeep2         = htonl(pDb->cfg.daysToKeep1);        //user,client,mnode use keep0,keep1,keep2; vnode use keep1,keep2,keep
   pCfg->minRowsPerFileBlock = htonl(pDb->cfg.minRowsPerFileBlock);
   pCfg->maxRowsPerFileBlock = htonl(pDb->cfg.maxRowsPerFileBlock);
   pCfg->fsyncPeriod         = htonl(pDb->cfg.fsyncPeriod);
@@ -946,10 +944,10 @@ SRpcEpSet mnodeGetEpSetFromIp(char *ep) {
   return epSet;
 }
 
-static void mnodeSendAlterVnodeMsg(SVgObj *pVgroup, SRpcEpSet *epSet) {
+static void mnodeSendAlterVnodeMsg(SVgObj *pVgroup, SRpcEpSet *epSet, SMnodeMsg *pMsg) {
   SAlterVnodeMsg *pAlter = mnodeBuildVnodeMsg(pVgroup);
   SRpcMsg rpcMsg = {
-    .ahandle = NULL,
+    .ahandle = pMsg,
     .pCont   = pAlter,
     .contLen = pAlter ? sizeof(SAlterVnodeMsg) : 0,
     .code    = 0,
@@ -958,14 +956,18 @@ static void mnodeSendAlterVnodeMsg(SVgObj *pVgroup, SRpcEpSet *epSet) {
   dnodeSendMsgToDnode(epSet, &rpcMsg);
 }
 
-void mnodeSendAlterVgroupMsg(SVgObj *pVgroup) {
+void mnodeSendAlterVgroupMsg(SVgObj *pVgroup,SMnodeMsg *pMsg) {
   mDebug("vgId:%d, send alter all vnodes msg, numOfVnodes:%d db:%s", pVgroup->vgId, pVgroup->numOfVnodes,
          pVgroup->dbName);
+  if (pMsg) {
+    pMsg->pVgroup = pVgroup;
+    mnodeIncVgroupRef(pVgroup);
+  }
   for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
     SRpcEpSet epSet = mnodeGetEpSetFromIp(pVgroup->vnodeGid[i].pDnode->dnodeEp);
     mDebug("vgId:%d, index:%d, send alter vnode msg to dnode %s", pVgroup->vgId, i,
            pVgroup->vnodeGid[i].pDnode->dnodeEp);
-    mnodeSendAlterVnodeMsg(pVgroup, &epSet);
+    mnodeSendAlterVnodeMsg(pVgroup, &epSet,pMsg);
   }
 }
 
@@ -1026,11 +1028,27 @@ void mnodeSendCreateVgroupMsg(SVgObj *pVgroup, void *ahandle) {
 }
 
 static void mnodeProcessAlterVnodeRsp(SRpcMsg *rpcMsg) {
-  mDebug("alter vnode rsp received");
-}
+  mDebug("alter vnode rsp is received, handle:%p", rpcMsg->ahandle);
+  if (rpcMsg->ahandle == NULL) return;
 
-static void mnodeProcessSyncVnodeRsp(SRpcMsg *rpcMsg) {
-  mDebug("sync vnode rsp received");
+  SMnodeMsg *mnodeMsg = rpcMsg->ahandle;
+  mnodeMsg->received++;
+  if (rpcMsg->code == TSDB_CODE_SUCCESS) {
+    mnodeMsg->code = rpcMsg->code;
+    mnodeMsg->successed++;
+  }
+
+  SVgObj *pVgroup = mnodeMsg->pVgroup;
+  mDebug("vgId:%d, alter vnode rsp received, result:%s received:%d successed:%d expected:%d, thandle:%p ahandle:%p",
+         pVgroup->vgId, tstrerror(rpcMsg->code), mnodeMsg->received, mnodeMsg->successed, mnodeMsg->expected,
+         mnodeMsg->rpcMsg.handle, rpcMsg->ahandle);
+
+  if (mnodeMsg->received != mnodeMsg->expected) return;
+
+  int32_t code = mnodeInsertAlterDbRow(pVgroup->pDb, mnodeMsg);
+  if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+    dnodeSendRpcMWriteRsp(mnodeMsg, code);
+  }
 }
 
 static void mnodeProcessCreateVnodeRsp(SRpcMsg *rpcMsg) {
diff --git a/src/os/inc/osTime.h b/src/os/inc/osTime.h
index 4743a8c160ce8228a2c564129f00ec2962038c56..f013a2f7d112c07e2b88b4329ff867e50c25ec0d 100644
--- a/src/os/inc/osTime.h
+++ b/src/os/inc/osTime.h
@@ -55,6 +55,13 @@ static FORCE_INLINE int64_t taosGetTimestampUs() {
   return (int64_t)systemTime.tv_sec * 1000000L + (int64_t)systemTime.tv_usec;
 }
 
+//@return timestamp in nanosecond
+static FORCE_INLINE int64_t taosGetTimestampNs() {
+  struct timespec systemTime = {0};
+  clock_gettime(CLOCK_REALTIME, &systemTime);
+  return (int64_t)systemTime.tv_sec * 1000000000L + (int64_t)systemTime.tv_nsec;
+}
+
 /*
  * @return timestamp decided by global conf variable, tsTimePrecision
  * if precision == TSDB_TIME_PRECISION_MICRO, it returns timestamp in microsecond.
@@ -63,7 +70,9 @@ static FORCE_INLINE int64_t taosGetTimestampUs() {
 static FORCE_INLINE int64_t taosGetTimestamp(int32_t precision) {
   if (precision == TSDB_TIME_PRECISION_MICRO) {
     return taosGetTimestampUs();
-  } else {
+  } else if (precision == TSDB_TIME_PRECISION_NANO) {
+    return taosGetTimestampNs();
+  }else {
     return taosGetTimestampMs();
   }
 }
@@ -88,12 +97,13 @@ int64_t taosTimeAdd(int64_t t, int64_t duration, char unit, int32_t precision);
 int64_t taosTimeTruncate(int64_t t, const SInterval* pInterval, int32_t precision);
 int32_t taosTimeCountInterval(int64_t skey, int64_t ekey, int64_t interval, char unit, int32_t precision);
 
-int32_t parseAbsoluteDuration(char* token, int32_t tokenlen, int64_t* ts);
-int32_t parseNatualDuration(const char* token, int32_t tokenLen, int64_t* duration, char* unit);
+int32_t parseAbsoluteDuration(char* token, int32_t tokenlen, int64_t* ts, int32_t timePrecision);
+int32_t parseNatualDuration(const char* token, int32_t tokenLen, int64_t* duration, char* unit, int32_t timePrecision);
 
 int32_t taosParseTime(char* timestr, int64_t* time, int32_t len, int32_t timePrec, int8_t dayligth);
 void    deltaToUtcInitOnce();
 
+int64_t convertTimePrecision(int64_t time, int32_t fromPrecision, int32_t toPrecision);
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/os/src/detail/osString.c b/src/os/src/detail/osString.c
index 2c49797d83dd4bb53b2fef69091e28be7194461e..fdc70b667e08face21554c99e2109bc49cf41cbf 100644
--- a/src/os/src/detail/osString.c
+++ b/src/os/src/detail/osString.c
@@ -59,6 +59,9 @@ bool taosMbsToUcs4(char *mbs, size_t mbsLength, char *ucs4, int32_t ucs4_max_len
   iconv_close(cd);
   if (len != NULL) {
     *len = (int32_t)(ucs4_max_len - outLeft);
+    if (*len < 0) {
+      return false;
+    }
   }
 
   return true;
diff --git a/src/os/src/detail/osTime.c b/src/os/src/detail/osTime.c
index 2956dd29ad77dd82f1ed3d161f7b26af310d7347..4d64e14d9415a256b9ef5032db3de35bcfeedb79 100644
--- a/src/os/src/detail/osTime.c
+++ b/src/os/src/detail/osTime.c
@@ -14,7 +14,13 @@
  */
 
 #define _BSD_SOURCE
+
+#ifdef DARWIN
 #define _XOPEN_SOURCE
+#else
+#define _XOPEN_SOURCE 500
+#endif
+
 #define _DEFAULT_SOURCE
 
 #include "os.h"
@@ -119,8 +125,9 @@ int64_t parseFraction(char* str, char** end, int32_t timePrec) {
 
   const int32_t MILLI_SEC_FRACTION_LEN = 3;
   const int32_t MICRO_SEC_FRACTION_LEN = 6;
+  const int32_t NANO_SEC_FRACTION_LEN = 9;
 
-  int32_t factor[6] = {1, 10, 100, 1000, 10000, 100000};
+  int32_t factor[9] = {1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000};
   int32_t times = 1;
 
   while (str[i] >= '0' && str[i] <= '9') {
@@ -140,12 +147,17 @@ int64_t parseFraction(char* str, char** end, int32_t timePrec) {
     }
 
     times = MILLI_SEC_FRACTION_LEN - i;
-  } else {
-    assert(timePrec == TSDB_TIME_PRECISION_MICRO);
+  } else if (timePrec == TSDB_TIME_PRECISION_MICRO) {
     if (i >= MICRO_SEC_FRACTION_LEN) {
       i = MICRO_SEC_FRACTION_LEN;
     }
     times = MICRO_SEC_FRACTION_LEN - i;
+  } else {
+    assert(timePrec == TSDB_TIME_PRECISION_NANO);
+    if (i >= NANO_SEC_FRACTION_LEN) {
+      i = NANO_SEC_FRACTION_LEN;
+    }
+    times = NANO_SEC_FRACTION_LEN - i;
   }
 
   fraction = strnatoi(str, i) * factor[times];
@@ -202,7 +214,9 @@ int32_t parseTimezone(char* str, int64_t* tzOffset) {
  * 2013-04-12T15:52:01.123+0800
  */
 int32_t parseTimeWithTz(char* timestr, int64_t* time, int32_t timePrec) {
-  int64_t factor = (timePrec == TSDB_TIME_PRECISION_MILLI) ? 1000 : 1000000;
+
+  int64_t factor = (timePrec == TSDB_TIME_PRECISION_MILLI) ? 1000 :
+                             (timePrec == TSDB_TIME_PRECISION_MICRO ? 1000000 : 1000000000);
   int64_t tzOffset = 0;
 
   struct tm tm = {0};
@@ -287,7 +301,8 @@ int32_t parseLocaltime(char* timestr, int64_t* time, int32_t timePrec) {
     }
   }
 
-  int64_t factor = (timePrec == TSDB_TIME_PRECISION_MILLI) ? 1000 : 1000000;
+  int64_t factor = (timePrec == TSDB_TIME_PRECISION_MILLI) ? 1000 :
+                   (timePrec == TSDB_TIME_PRECISION_MICRO ? 1000000 : 1000000000);
   *time = factor * seconds + fraction;
 
   return 0;
@@ -315,37 +330,50 @@ int32_t parseLocaltimeWithDst(char* timestr, int64_t* time, int32_t timePrec) {
     }
   }
 
-  int64_t factor = (timePrec == TSDB_TIME_PRECISION_MILLI) ? 1000 : 1000000;
+  int64_t factor = (timePrec == TSDB_TIME_PRECISION_MILLI) ? 1000 :
+                   (timePrec == TSDB_TIME_PRECISION_MICRO ? 1000000 : 1000000000);
   *time = factor * seconds + fraction;
   return 0;
 }
 
-
-static int32_t getDurationInUs(int64_t val, char unit, int64_t* result) {
-  *result = val;
-
-  int64_t factor = 1000L;
+int64_t convertTimePrecision(int64_t time, int32_t fromPrecision, int32_t toPrecision) {
+  assert(fromPrecision == TSDB_TIME_PRECISION_MILLI ||
+         fromPrecision == TSDB_TIME_PRECISION_MICRO ||
+         fromPrecision == TSDB_TIME_PRECISION_NANO);
+  assert(toPrecision == TSDB_TIME_PRECISION_MILLI ||
+         toPrecision == TSDB_TIME_PRECISION_MICRO ||
+         toPrecision == TSDB_TIME_PRECISION_NANO);
+  static double factors[3][3] = { {1.,            1000.,            1000000.},
+                                  {1.0 / 1000,    1.,               1000.},
+                                  {1.0 / 1000000, 1.0 / 1000,       1.} };
+  return (int64_t)((double)time * factors[fromPrecision][toPrecision]);
+}
+static int32_t getDuration(int64_t val, char unit, int64_t* result, int32_t timePrecision) {
 
   switch (unit) {
     case 's':
-      (*result) *= MILLISECOND_PER_SECOND*factor;
+      (*result) = convertTimePrecision(val * MILLISECOND_PER_SECOND, TSDB_TIME_PRECISION_MILLI, timePrecision);
       break;
     case 'm':
-      (*result) *= MILLISECOND_PER_MINUTE*factor;
+      (*result) = convertTimePrecision(val * MILLISECOND_PER_MINUTE, TSDB_TIME_PRECISION_MILLI, timePrecision);
       break;
     case 'h':
-      (*result) *= MILLISECOND_PER_HOUR*factor;
+      (*result) = convertTimePrecision(val * MILLISECOND_PER_HOUR, TSDB_TIME_PRECISION_MILLI, timePrecision);
       break;
     case 'd':
-      (*result) *= MILLISECOND_PER_DAY*factor;
+      (*result) = convertTimePrecision(val * MILLISECOND_PER_DAY, TSDB_TIME_PRECISION_MILLI, timePrecision);
       break;
     case 'w':
-      (*result) *= MILLISECOND_PER_WEEK*factor;
+      (*result) = convertTimePrecision(val * MILLISECOND_PER_WEEK, TSDB_TIME_PRECISION_MILLI, timePrecision);
       break;
     case 'a':
-      (*result) *= factor;
+      (*result) = convertTimePrecision(val, TSDB_TIME_PRECISION_MILLI, timePrecision);
       break;
     case 'u':
+      (*result) = convertTimePrecision(val, TSDB_TIME_PRECISION_MICRO, timePrecision);
+      break;
+    case 'b':
+      (*result) = convertTimePrecision(val, TSDB_TIME_PRECISION_NANO, timePrecision);
       break;
     default: {
       return -1;
@@ -357,6 +385,8 @@ static int32_t getDurationInUs(int64_t val, char unit, int64_t* result) {
 }
 
 /*
+ * b - nanoseconds;
+ * u - microseconds;
  * a - Millionseconds
  * s - Seconds
  * m - Minutes
@@ -366,7 +396,7 @@ static int32_t getDurationInUs(int64_t val, char unit, int64_t* result) {
  * n - Months (30 days)
  * y - Years (365 days)
  */
-int32_t parseAbsoluteDuration(char* token, int32_t tokenlen, int64_t* duration) {
+int32_t parseAbsoluteDuration(char* token, int32_t tokenlen, int64_t* duration, int32_t timePrecision) {
   errno = 0;
   char* endPtr = NULL;
 
@@ -382,10 +412,10 @@ int32_t parseAbsoluteDuration(char* token, int32_t tokenlen, int64_t* duration)
     return -1;
   }
 
-  return getDurationInUs(timestamp, unit, duration);
+  return getDuration(timestamp, unit, duration, timePrecision);
 }
 
-int32_t parseNatualDuration(const char* token, int32_t tokenLen, int64_t* duration, char* unit) {
+int32_t parseNatualDuration(const char* token, int32_t tokenLen, int64_t* duration, char* unit, int32_t timePrecision) {
   errno = 0;
 
   /* get the basic numeric value */
@@ -399,7 +429,7 @@ int32_t parseNatualDuration(const char* token, int32_t tokenLen, int64_t* durati
     return 0;
   }
 
-  return getDurationInUs(*duration, *unit, duration);
+  return getDuration(*duration, *unit, duration, timePrecision);
 }
 
 int64_t taosTimeAdd(int64_t t, int64_t duration, char unit, int32_t precision) {
diff --git a/src/plugins/http/inc/httpJson.h b/src/plugins/http/inc/httpJson.h
index 4d182d0132528367a8e25b8f72329331be2cb5c5..3595ad926fa08a7ba87fc758c2b0472d34617488 100644
--- a/src/plugins/http/inc/httpJson.h
+++ b/src/plugins/http/inc/httpJson.h
@@ -64,8 +64,8 @@ void httpJsonOriginString(JsonBuf* buf, char* sVal, int32_t len);
 void httpJsonStringForTransMean(JsonBuf* buf, char* SVal, int32_t maxLen);
 void httpJsonInt64(JsonBuf* buf, int64_t num);
 void httpJsonUInt64(JsonBuf* buf, uint64_t num);
-void httpJsonTimestamp(JsonBuf* buf, int64_t t, bool us);
-void httpJsonUtcTimestamp(JsonBuf* buf, int64_t t, bool us);
+void httpJsonTimestamp(JsonBuf* buf, int64_t t, int32_t timePrecision);
+void httpJsonUtcTimestamp(JsonBuf* buf, int64_t t, int32_t timePrecision);
 void httpJsonInt(JsonBuf* buf, int32_t num);
 void httpJsonUInt(JsonBuf* buf, uint32_t num);
 void httpJsonFloat(JsonBuf* buf, float num);
diff --git a/src/plugins/http/src/httpJson.c b/src/plugins/http/src/httpJson.c
index 19166e720f0e517ccd1a793742836ae4bc245bd1..df4c4fbc63d469c22ea13273564bec49562f35a9 100644
--- a/src/plugins/http/src/httpJson.c
+++ b/src/plugins/http/src/httpJson.c
@@ -262,42 +262,92 @@ void httpJsonUInt64(JsonBuf* buf, uint64_t num) {
   buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%" PRIu64, num);
 }
 
-void httpJsonTimestamp(JsonBuf* buf, int64_t t, bool us) {
+void httpJsonTimestamp(JsonBuf* buf, int64_t t, int32_t timePrecision) {
   char       ts[35] = {0};
   struct tm* ptm;
-  int32_t    precision = 1000;
-  if (us) {
-    precision = 1000000;
+
+  int32_t fractionLen;
+  char* format = NULL;
+  time_t quot = 0;
+  long mod = 0;
+
+  switch (timePrecision) {
+    case TSDB_TIME_PRECISION_MILLI: {
+      quot = t / 1000;
+      fractionLen = 5;
+      format = ".%03" PRId64;
+      mod = t % 1000;
+      break;
+    }
+
+    case TSDB_TIME_PRECISION_MICRO: {
+      quot = t / 1000000;
+      fractionLen = 8;
+      format = ".%06" PRId64;
+      mod = t % 1000000;
+      break;
+    }
+
+    case TSDB_TIME_PRECISION_NANO: {
+      quot = t / 1000000000;
+      fractionLen = 11;
+      format = ".%09" PRId64;
+      mod = t % 1000000000;
+      break;
+    }
+
+    default:
+      assert(false);
   }
 
-  time_t tt = t / precision;
-  ptm = localtime(&tt);
+  ptm = localtime(&quot);
   int32_t length = (int32_t)strftime(ts, 35, "%Y-%m-%d %H:%M:%S", ptm);
-  if (us) {
-    length += snprintf(ts + length, 8, ".%06" PRId64, t % precision);
-  } else {
-    length += snprintf(ts + length, 5, ".%03" PRId64, t % precision);
-  }
+  length += snprintf(ts + length, fractionLen, format, mod);
 
   httpJsonString(buf, ts, length);
 }
 
-void httpJsonUtcTimestamp(JsonBuf* buf, int64_t t, bool us) {
+void httpJsonUtcTimestamp(JsonBuf* buf, int64_t t, int32_t timePrecision) {
   char       ts[40] = {0};
   struct tm* ptm;
-  int32_t    precision = 1000;
-  if (us) {
-    precision = 1000000;
+
+  int32_t fractionLen;
+  char* format = NULL;
+  time_t quot = 0;
+  long mod = 0;
+
+  switch (timePrecision) {
+    case TSDB_TIME_PRECISION_MILLI: {
+      quot = t / 1000;
+      fractionLen = 5;
+      format = ".%03" PRId64;
+      mod = t % 1000;
+      break;
+    }
+
+    case TSDB_TIME_PRECISION_MICRO: {
+      quot = t / 1000000;
+      fractionLen = 8;
+      format = ".%06" PRId64;
+      mod = t % 1000000;
+      break;
+    }
+
+    case TSDB_TIME_PRECISION_NANO: {
+      quot = t / 1000000000;
+      fractionLen = 11;
+      format = ".%09" PRId64;
+      mod = t % 1000000000;
+      break;
+    }
+
+    default:
+      assert(false);
   }
 
-  time_t tt = t / precision;
-  ptm = localtime(&tt);
+  ptm = localtime(&quot);
   int32_t length = (int32_t)strftime(ts, 40, "%Y-%m-%dT%H:%M:%S", ptm);
-  if (us) {
-    length += snprintf(ts + length, 8, ".%06" PRId64, t % precision);
-  } else {
-    length += snprintf(ts + length, 5, ".%03" PRId64, t % precision);
-  }
+  length += snprintf(ts + length, fractionLen, format, mod);
   length += (int32_t)strftime(ts + length, 40 - length, "%z", ptm);
 
   httpJsonString(buf, ts, length);
diff --git a/src/plugins/http/src/httpRestJson.c b/src/plugins/http/src/httpRestJson.c
index 60c23e603e5107e858db2138d1aed87d5f8a5e1b..47f2d4ff5bcc513aafb8ea8f4e2a85db5a35b12a 100644
--- a/src/plugins/http/src/httpRestJson.c
+++ b/src/plugins/http/src/httpRestJson.c
@@ -186,13 +186,11 @@ bool restBuildSqlJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result,
           break;
         case TSDB_DATA_TYPE_TIMESTAMP:
           if (timestampFormat == REST_TIMESTAMP_FMT_LOCAL_STRING) {
-            httpJsonTimestamp(jsonBuf, *((int64_t *)row[i]),
-                              taos_result_precision(result) == TSDB_TIME_PRECISION_MICRO);
+            httpJsonTimestamp(jsonBuf, *((int64_t *)row[i]), taos_result_precision(result));
           } else if (timestampFormat == REST_TIMESTAMP_FMT_TIMESTAMP) {
             httpJsonInt64(jsonBuf, *((int64_t *)row[i]));
           } else {
-            httpJsonUtcTimestamp(jsonBuf, *((int64_t *)row[i]),
-                                 taos_result_precision(result) == TSDB_TIME_PRECISION_MICRO);
+            httpJsonUtcTimestamp(jsonBuf, *((int64_t *)row[i]), taos_result_precision(result));
           }
           break;
         default:
diff --git a/src/plugins/monitor/src/monMain.c b/src/plugins/monitor/src/monMain.c
index d9f7d81ebd3eefe77569deb30b75c227ff79e04f..2c4a0c1a4c56e560a9ffe5ec007cc51f9d7f9e24 100644
--- a/src/plugins/monitor/src/monMain.c
+++ b/src/plugins/monitor/src/monMain.c
@@ -184,11 +184,17 @@ static void *monThreadFunc(void *param) {
 static void monBuildMonitorSql(char *sql, int32_t cmd) {
   memset(sql, 0, SQL_LENGTH);
 
+#ifdef _STORAGE
+  char *keepValue = "30,30,30";
+#else
+  char *keepValue = "30";
+#endif
+
   if (cmd == MON_CMD_CREATE_DB) {
     snprintf(sql, SQL_LENGTH,
-             "create database if not exists %s replica 1 days 10 keep 30 cache %d "
+             "create database if not exists %s replica 1 days 10 keep %s cache %d "
              "blocks %d precision 'us'",
-             tsMonitorDbName, TSDB_MIN_CACHE_BLOCK_SIZE, TSDB_MIN_TOTAL_BLOCKS);
+             tsMonitorDbName, keepValue, TSDB_MIN_CACHE_BLOCK_SIZE, TSDB_MIN_TOTAL_BLOCKS);
   } else if (cmd == MON_CMD_CREATE_MT_DN) {
     snprintf(sql, SQL_LENGTH,
              "create table if not exists %s.dn(ts timestamp"
diff --git a/src/query/inc/qExecutor.h b/src/query/inc/qExecutor.h
index 24547c1e0bdbfd86b9eb9a4ab45001733fea868e..955dd734cf58582ecfe1bbf9871525be0ebc161c 100644
--- a/src/query/inc/qExecutor.h
+++ b/src/query/inc/qExecutor.h
@@ -464,6 +464,7 @@ typedef struct SSWindowOperatorInfo {
   TSKEY          prevTs;     // previous timestamp
   int32_t        numOfRows;  // number of rows
   int32_t        start;      // start row index
+  bool           reptScan;    // next round scan
 } SSWindowOperatorInfo;
 
 typedef struct SStateWindowOperatorInfo {
@@ -473,7 +474,7 @@ typedef struct SStateWindowOperatorInfo {
   int32_t        colIndex;      // start row index
   int32_t        start;
   char*          prevData;    // previous data 
-   
+  bool           reptScan;
 } SStateWindowOperatorInfo ;
 
 typedef struct SDistinctOperatorInfo {
diff --git a/src/query/inc/qSqlparser.h b/src/query/inc/qSqlparser.h
index 652191bf0fb402ab1114a2797176b0379dd5dba4..c2a4e99b63b1a3d2b07ba11f79f0f8be66e529e2 100644
--- a/src/query/inc/qSqlparser.h
+++ b/src/query/inc/qSqlparser.h
@@ -46,7 +46,7 @@ enum SQL_NODE_FROM_TYPE {
 
 enum SQL_EXPR_FLAG {
   EXPR_FLAG_TS_ERROR = 1,
-  EXPR_FLAG_US_TIMESTAMP = 2,
+  EXPR_FLAG_NS_TIMESTAMP = 2,
   EXPR_FLAG_TIMESTAMP_VAR = 3,
 };
 
diff --git a/src/query/inc/sql.y b/src/query/inc/sql.y
index c7be2f3c4f196a33e6f6d10810c0a0acebcd7fa7..fbb59e4a728724fd2fc2638d6d754cf2347350b6 100644
--- a/src/query/inc/sql.y
+++ b/src/query/inc/sql.y
@@ -238,9 +238,18 @@ acct_optr(Y) ::= pps(C) tseries(D) storage(P) streams(F) qtime(Q) dbs(E) users(K
     Y.stat    = M;
 }
 
+%type intitemlist {SArray*}
+%destructor intitemlist {taosArrayDestroy($$);}
+
+%type intitem {tVariant}
+intitemlist(A) ::= intitemlist(X) COMMA intitem(Y). { A = tVariantListAppend(X, &Y, -1);    }
+intitemlist(A) ::= intitem(X).                      { A = tVariantListAppend(NULL, &X, -1); }
+
+intitem(A) ::= INTEGER(X).      { toTSDBType(X.type); tVariantCreate(&A, &X); }
+
 %type keep {SArray*}
 %destructor keep {taosArrayDestroy($$);}
-keep(Y)    ::= KEEP tagitemlist(X).           { Y = X; }
+keep(Y)    ::= KEEP intitemlist(X).           { Y = X; }
 
 cache(Y)   ::= CACHE INTEGER(X).              { Y = X; }
 replica(Y) ::= REPLICA INTEGER(X).            { Y = X; }
diff --git a/src/query/src/qAggMain.c b/src/query/src/qAggMain.c
index 117dd2c1d999b8103991ef67e5f44a942bd8e021..68de90255643ee6ceae6b560cd53226827c29017 100644
--- a/src/query/src/qAggMain.c
+++ b/src/query/src/qAggMain.c
@@ -4684,8 +4684,8 @@ static bool rate_function_setup(SQLFunctionCtx *pCtx) {
   pInfo->correctionValue = 0;
   pInfo->firstKey    = INT64_MIN;
   pInfo->lastKey     = INT64_MIN;
-  pInfo->firstValue  = INT64_MIN;
-  pInfo->lastValue   = INT64_MIN;
+  pInfo->firstValue  = (double) INT64_MIN;
+  pInfo->lastValue   = (double) INT64_MIN;
 
   pInfo->hasResult = 0;
   pInfo->isIRate = (pCtx->functionId == TSDB_FUNC_IRATE);
@@ -5000,6 +5000,19 @@ void generateBlockDistResult(STableBlockDist *pTableBlockDist, char* result) {
   min = totalBlocks > 0 ? pTableBlockDist->minRows : 0;
   max = totalBlocks > 0 ? pTableBlockDist->maxRows : 0;
 
+  double stdDev = 0;
+  if (totalBlocks > 0) {
+    double variance = 0;
+    for (int32_t i = 0; i < numSteps; i++) {
+      SFileBlockInfo *blockInfo = taosArrayGet(blockInfos, i);
+      int64_t         blocks = blockInfo->numBlocksOfStep;
+      int32_t         rows = (i * TSDB_BLOCK_DIST_STEP_ROWS + TSDB_BLOCK_DIST_STEP_ROWS / 2);
+      variance += blocks * (rows - avg) * (rows - avg);
+    }
+    variance = variance / totalBlocks;
+    stdDev = sqrt(variance);
+  }
+
   double percents[] = {0.05, 0.10, 0.20, 0.30, 0.40, 0.50, 0.60, 0.70, 0.80, 0.90, 0.95, 0.99};
   int32_t percentiles[] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
   assert(sizeof(percents)/sizeof(double) == sizeof(percentiles)/sizeof(int32_t));
@@ -5014,12 +5027,12 @@ void generateBlockDistResult(STableBlockDist *pTableBlockDist, char* result) {
                    "60th=[%d], 70th=[%d], 80th=[%d], 90th=[%d], 95th=[%d], 99th=[%d]\n\t "
                    "Min=[%"PRId64"(Rows)] Max=[%"PRId64"(Rows)] Avg=[%"PRId64"(Rows)] Stddev=[%.2f] \n\t "
                    "Rows=[%"PRIu64"], Blocks=[%"PRId64"], Size=[%.3f(Kb)] Comp=[%.2f]\n\t "
-                   "RowsInMem=[%d] \n\t SeekHeaderTime=[%d(us)]",
+                   "RowsInMem=[%d] \n\t",
                    percentiles[0], percentiles[1], percentiles[2], percentiles[3], percentiles[4], percentiles[5],
                    percentiles[6], percentiles[7], percentiles[8], percentiles[9], percentiles[10], percentiles[11],
-                   min, max, avg, 0.0,
+                   min, max, avg, stdDev,
                    totalRows, totalBlocks, totalLen/1024.0, compRatio,
-                   pTableBlockDist->numOfRowsInMemTable, pTableBlockDist->firstSeekTimeUs);
+                   pTableBlockDist->numOfRowsInMemTable);
   varDataSetLen(result, sz);
   UNUSED(sz);
 }
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 2d6b1c0bf60ebe3e6bf3c7613df4f9499dcdddd6..395903f75ef4a0cb4626baf9416c17a9b8221052 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -30,6 +30,7 @@
 
 #define IS_MASTER_SCAN(runtime)        ((runtime)->scanFlag == MASTER_SCAN)
 #define IS_REVERSE_SCAN(runtime)       ((runtime)->scanFlag == REVERSE_SCAN)
+#define IS_REPEAT_SCAN(runtime)        ((runtime)->scanFlag == REPEAT_SCAN) 
 #define SET_MASTER_SCAN_FLAG(runtime)  ((runtime)->scanFlag = MASTER_SCAN)
 #define SET_REVERSE_SCAN_FLAG(runtime) ((runtime)->scanFlag = REVERSE_SCAN)
 
@@ -130,10 +131,10 @@ static void getNextTimeWindow(SQueryAttr* pQueryAttr, STimeWindow* tw) {
     return;
   }
 
-  int64_t key = tw->skey / 1000, interval = pQueryAttr->interval.interval;
-  if (pQueryAttr->precision == TSDB_TIME_PRECISION_MICRO) {
-    key /= 1000;
-  }
+  int64_t key = tw->skey, interval = pQueryAttr->interval.interval;
+  //convert key to second
+  key = convertTimePrecision(key, pQueryAttr->precision, TSDB_TIME_PRECISION_MILLI) / 1000;
+
   if (pQueryAttr->interval.intervalUnit == 'y') {
     interval *= 12;
   }
@@ -145,17 +146,13 @@ static void getNextTimeWindow(SQueryAttr* pQueryAttr, STimeWindow* tw) {
   int mon = (int)(tm.tm_year * 12 + tm.tm_mon + interval * factor);
   tm.tm_year = mon / 12;
   tm.tm_mon = mon % 12;
-  tw->skey = mktime(&tm) * 1000L;
+  tw->skey = convertTimePrecision(mktime(&tm) * 1000L, TSDB_TIME_PRECISION_MILLI, pQueryAttr->precision);
 
   mon = (int)(mon + interval);
   tm.tm_year = mon / 12;
   tm.tm_mon = mon % 12;
-  tw->ekey = mktime(&tm) * 1000L;
+  tw->ekey = convertTimePrecision(mktime(&tm) * 1000L, TSDB_TIME_PRECISION_MILLI, pQueryAttr->precision);
 
-  if (pQueryAttr->precision == TSDB_TIME_PRECISION_MICRO) {
-    tw->skey *= 1000L;
-    tw->ekey *= 1000L;
-  }
   tw->ekey -= 1;
 }
 
@@ -1337,6 +1334,10 @@ static void doSessionWindowAggImpl(SOperatorInfo* pOperator, SSWindowOperatorInf
 
   int64_t gap = pOperator->pRuntimeEnv->pQueryAttr->sw.gap;
   pInfo->numOfRows = 0;
+  if (IS_REPEAT_SCAN(pRuntimeEnv) && !pInfo->reptScan) {
+    pInfo->reptScan = true;
+    pInfo->prevTs = INT64_MIN;
+  }
 
   TSKEY* tsList = (TSKEY*)pColInfoData->pData;
   for (int32_t j = 0; j < pSDataBlock->info.rows; ++j) {
@@ -1346,7 +1347,7 @@ static void doSessionWindowAggImpl(SOperatorInfo* pOperator, SSWindowOperatorInf
       pInfo->prevTs = tsList[j];
       pInfo->numOfRows = 1;
       pInfo->start = j;
-    } else if (tsList[j] - pInfo->prevTs <= gap) {
+    } else if (tsList[j] - pInfo->prevTs <= gap && (tsList[j] - pInfo->prevTs) >= 0) {
       pInfo->curWindow.ekey = tsList[j];
       pInfo->prevTs = tsList[j];
       pInfo->numOfRows += 1;
@@ -2281,7 +2282,7 @@ static bool doFilterByBlockStatistics(SQueryRuntimeEnv* pRuntimeEnv, SDataStatis
   if (pDataStatis == NULL || pQueryAttr->numOfFilterCols == 0) {
     return true;
   }
-
+  bool ret = true;
   for (int32_t k = 0; k < pQueryAttr->numOfFilterCols; ++k) {
     SSingleColumnFilterInfo *pFilterInfo = &pQueryAttr->pFilterInfo[k];
 
@@ -2318,26 +2319,34 @@ static bool doFilterByBlockStatistics(SQueryRuntimeEnv* pRuntimeEnv, SDataStatis
     }
 
     SDataStatis* pDataBlockst = &pDataStatis[index];
-
+    
     if (pFilterInfo->info.type == TSDB_DATA_TYPE_FLOAT) {
       float minval = (float)(*(double *)(&pDataBlockst->min));
       float maxval = (float)(*(double *)(&pDataBlockst->max));
-
+       
       for (int32_t i = 0; i < pFilterInfo->numOfFilters; ++i) {
-        if (pFilterInfo->pFilters[i].fp(&pFilterInfo->pFilters[i], (char *)&minval, (char *)&maxval, TSDB_DATA_TYPE_FLOAT)) {
-          return true;
+        if (pFilterInfo->pFilters[i].filterInfo.lowerRelOptr == TSDB_RELATION_IN) {
+           continue;   
+        }
+        ret &= pFilterInfo->pFilters[i].fp(&pFilterInfo->pFilters[i], (char *)&minval, (char *)&maxval, TSDB_DATA_TYPE_FLOAT);
+        if (ret == false) {
+          return false;
         }
       }
     } else {
       for (int32_t i = 0; i < pFilterInfo->numOfFilters; ++i) {
-        if (pFilterInfo->pFilters[i].fp(&pFilterInfo->pFilters[i], (char *)&pDataBlockst->min, (char *)&pDataBlockst->max, pFilterInfo->info.type)) {
-          return true;
+        if (pFilterInfo->pFilters[i].filterInfo.lowerRelOptr == TSDB_RELATION_IN) {
+           continue; 
+        }
+        ret &= pFilterInfo->pFilters[i].fp(&pFilterInfo->pFilters[i], (char *)&pDataBlockst->min, (char *)&pDataBlockst->max, pFilterInfo->info.type); 
+        if (ret == false) {
+          return false;
         }
       }
     }
   }
 
-  return false;
+  return ret;
 }
 
 static bool overlapWithTimeWindow(SQueryAttr* pQueryAttr, SDataBlockInfo* pBlockInfo) {
@@ -5177,6 +5186,10 @@ static void doStateWindowAggImpl(SOperatorInfo* pOperator, SStateWindowOperatorI
 
   SColumnInfoData* pTsColInfoData = taosArrayGet(pSDataBlock->pDataBlock, 0);
   TSKEY* tsList = (TSKEY*)pTsColInfoData->pData;
+  if (IS_REPEAT_SCAN(pRuntimeEnv) && !pInfo->reptScan) {
+    pInfo->reptScan = true;
+    tfree(pInfo->prevData); 
+  }
 
   pInfo->numOfRows = 0;
   for (int32_t j = 0; j < pSDataBlock->info.rows; ++j) {
@@ -5763,6 +5776,7 @@ SOperatorInfo* createTimeIntervalOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOp
 SOperatorInfo* createStatewindowOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput) {
   SStateWindowOperatorInfo* pInfo = calloc(1, sizeof(SStateWindowOperatorInfo));
   pInfo->colIndex   = -1;
+  pInfo->reptScan   = false;
   pInfo->binfo.pCtx = createSQLFunctionCtx(pRuntimeEnv, pExpr, numOfOutput, &pInfo->binfo.rowCellInfoOffset);
   pInfo->binfo.pRes = createOutputBuf(pExpr, numOfOutput, pRuntimeEnv->resultInfo.capacity);
   initResultRowInfo(&pInfo->binfo.resultRowInfo, 8, TSDB_DATA_TYPE_INT);
@@ -5790,7 +5804,8 @@ SOperatorInfo* createSWindowOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperato
   pInfo->binfo.pRes = createOutputBuf(pExpr, numOfOutput, pRuntimeEnv->resultInfo.capacity);
   initResultRowInfo(&pInfo->binfo.resultRowInfo, 8, TSDB_DATA_TYPE_INT);
 
-  pInfo->prevTs = INT64_MIN;
+  pInfo->prevTs   = INT64_MIN;
+  pInfo->reptScan = false; 
   SOperatorInfo* pOperator = calloc(1, sizeof(SOperatorInfo));
 
   pOperator->name         = "SessionWindowAggOperator";
diff --git a/src/query/src/qFilterfunc.c b/src/query/src/qFilterfunc.c
index 663f8814a0d57eb8cecad7f2d62944425510f029..7e8dd66ed12ee38d9dba5c982a5b78fda9a872ac 100644
--- a/src/query/src/qFilterfunc.c
+++ b/src/query/src/qFilterfunc.c
@@ -262,7 +262,7 @@ bool inOperator(SColumnFilterElem *pFilter, const char* minval, const char* maxv
       return NULL != taosHashGet((SHashObj *)pFilter->q, (char *)&minv, sizeof(minv));     
     }
     return true; 
-  } else if (type == TSDB_DATA_TYPE_DOUBLE || type == TSDB_DATA_TYPE_DOUBLE) {
+  } else if (type == TSDB_DATA_TYPE_DOUBLE || type == TSDB_DATA_TYPE_FLOAT) {
     double v;
     GET_TYPED_DATA(v, double, type, minval);
     return NULL != taosHashGet((SHashObj *)pFilter->q, (char *)&v, sizeof(v));     
diff --git a/src/query/src/qSqlParser.c b/src/query/src/qSqlParser.c
index 2cf3463d6009f47802e89f0651257d6f6f803376..f725c7da2f6f6d8483d953b4022bd6b21aad051d 100644
--- a/src/query/src/qSqlParser.c
+++ b/src/query/src/qSqlParser.c
@@ -139,19 +139,20 @@ tSqlExpr *tSqlExprCreateIdValue(SStrToken *pToken, int32_t optrType) {
     pSqlExpr->tokenId = optrType;
     pSqlExpr->type    = SQL_NODE_VALUE;
   } else if (optrType == TK_NOW) {
-    // use microsecond by default
-    pSqlExpr->value.i64 = taosGetTimestamp(TSDB_TIME_PRECISION_MICRO);
+    // use nanosecond by default TODO set value after getting database precision
+    pSqlExpr->value.i64 = taosGetTimestamp(TSDB_TIME_PRECISION_NANO);
     pSqlExpr->value.nType = TSDB_DATA_TYPE_BIGINT;
     pSqlExpr->tokenId = TK_TIMESTAMP;  // TK_TIMESTAMP used to denote the time value is in microsecond
     pSqlExpr->type    = SQL_NODE_VALUE;
-    pSqlExpr->flags  |= 1 << EXPR_FLAG_US_TIMESTAMP;
+    pSqlExpr->flags  |= 1 << EXPR_FLAG_NS_TIMESTAMP;
   } else if (optrType == TK_VARIABLE) {
-    int32_t ret = parseAbsoluteDuration(pToken->z, pToken->n, &pSqlExpr->value.i64);
+    // use nanosecond by default TODO set value after getting database precision
+    int32_t ret = parseAbsoluteDuration(pToken->z, pToken->n, &pSqlExpr->value.i64, TSDB_TIME_PRECISION_NANO);
     if (ret != TSDB_CODE_SUCCESS) {
       terrno = TSDB_CODE_TSC_SQL_SYNTAX_ERROR;
     }
 
-    pSqlExpr->flags  |= 1 << EXPR_FLAG_US_TIMESTAMP;
+    pSqlExpr->flags  |= 1 << EXPR_FLAG_NS_TIMESTAMP;
     pSqlExpr->flags  |= 1 << EXPR_FLAG_TIMESTAMP_VAR;
     pSqlExpr->value.nType = TSDB_DATA_TYPE_BIGINT;
     pSqlExpr->tokenId = TK_TIMESTAMP;
diff --git a/src/query/src/sql.c b/src/query/src/sql.c
index ac6508e45c2a643f0224bed49ea8e75efd441fcd..83deb641f51d412d7f3e4175391942623c995f7e 100644
--- a/src/query/src/sql.c
+++ b/src/query/src/sql.c
@@ -97,28 +97,28 @@
 #endif
 /************* Begin control #defines *****************************************/
 #define YYCODETYPE unsigned short int
-#define YYNOCODE 268
+#define YYNOCODE 270
 #define YYACTIONTYPE unsigned short int
 #define ParseTOKENTYPE SStrToken
 typedef union {
   int yyinit;
   ParseTOKENTYPE yy0;
-  SArray* yy15;
-  SWindowStateVal yy96;
-  SSqlNode* yy134;
-  SLimitVal yy150;
-  SSessionWindowVal yy151;
-  SRelationInfo* yy160;
-  int yy250;
-  tSqlExpr* yy328;
-  tVariant yy380;
-  SCreatedTableInfo yy390;
-  SCreateAcctInfo yy397;
-  SCreateDbInfo yy454;
-  SCreateTableSql* yy482;
-  int64_t yy489;
-  SIntervalVal yy496;
-  TAOS_FIELD yy505;
+  SSessionWindowVal yy15;
+  SIntervalVal yy42;
+  tSqlExpr* yy68;
+  SCreateAcctInfo yy77;
+  SArray* yy93;
+  int yy150;
+  SSqlNode* yy224;
+  SWindowStateVal yy274;
+  int64_t yy279;
+  SLimitVal yy284;
+  TAOS_FIELD yy325;
+  SRelationInfo* yy330;
+  SCreateDbInfo yy372;
+  tVariant yy518;
+  SCreatedTableInfo yy528;
+  SCreateTableSql* yy532;
 } YYMINORTYPE;
 #ifndef YYSTACKDEPTH
 #define YYSTACKDEPTH 100
@@ -128,17 +128,17 @@ typedef union {
 #define ParseARG_FETCH SSqlInfo* pInfo = yypParser->pInfo
 #define ParseARG_STORE yypParser->pInfo = pInfo
 #define YYFALLBACK 1
-#define YYNSTATE             341
-#define YYNRULE              280
+#define YYNSTATE             342
+#define YYNRULE              283
 #define YYNTOKEN             189
-#define YY_MAX_SHIFT         340
-#define YY_MIN_SHIFTREDUCE   538
-#define YY_MAX_SHIFTREDUCE   817
-#define YY_ERROR_ACTION      818
-#define YY_ACCEPT_ACTION     819
-#define YY_NO_ACTION         820
-#define YY_MIN_REDUCE        821
-#define YY_MAX_REDUCE        1100
+#define YY_MAX_SHIFT         341
+#define YY_MIN_SHIFTREDUCE   542
+#define YY_MAX_SHIFTREDUCE   824
+#define YY_ERROR_ACTION      825
+#define YY_ACCEPT_ACTION     826
+#define YY_NO_ACTION         827
+#define YY_MIN_REDUCE        828
+#define YY_MAX_REDUCE        1110
 /************* End control #defines *******************************************/
 
 /* Define the yytestcase() macro to be a no-op if is not already defined
@@ -204,276 +204,277 @@ typedef union {
 **  yy_default[]       Default action for each state.
 **
 *********** Begin parsing tables **********************************************/
-#define YY_ACTTAB_COUNT (721)
+#define YY_ACTTAB_COUNT (725)
 static const YYACTIONTYPE yy_action[] = {
- /*     0 */   989,  586,  217,  338,  954,   22,  223,  192,  194,  587,
- /*    10 */   819,  340,  198,   52,   53,  151,   56,   57,  226, 1077,
- /*    20 */   229,   46, 1073,   55,  282,   60,   58,   62,   59, 1072,
- /*    30 */   665,  194,  968,   51,   50,  194,  234,   49,   48,   47,
- /*    40 */    52,   53, 1076,   56,   57,  225, 1077,  229,   46,  586,
- /*    50 */    55,  282,   60,   58,   62,   59,  980,  587,  314,  313,
- /*    60 */    51,   50,  968,  986,   49,   48,   47,   53,   35,   56,
- /*    70 */    57,  144,  258,  229,   46,   75,   55,  282,   60,   58,
- /*    80 */    62,   59,  279,  298,   87,  867,   51,   50,   94,  178,
- /*    90 */    49,   48,   47,  539,  540,  541,  542,  543,  544,  545,
- /*   100 */   546,  547,  548,  549,  550,  551,  339,  953,  298,  218,
- /*   110 */    76,  586,  964,   52,   53,   35,   56,   57,  324,  587,
- /*   120 */   229,   46,  956,   55,  282,   60,   58,   62,   59,   49,
- /*   130 */    48,   47,  756,   51,   50,  265,  264,   49,   48,   47,
- /*   140 */    52,   54,  980,   56,   57, 1071,  980,  229,   46,  586,
- /*   150 */    55,  282,   60,   58,   62,   59,  219,  587,  220,  965,
- /*   160 */    51,   50,  221,  212,   49,   48,   47,   28,  296,  333,
- /*   170 */   332,  295,  294,  293,  331,  292,  330,  329,  328,  291,
- /*   180 */   327,  326,  928,   35,  916,  917,  918,  919,  920,  921,
- /*   190 */   922,  923,  924,  925,  926,  927,  929,  930,   56,   57,
- /*   200 */   151,  213,  229,   46,  151,   55,  282,   60,   58,   62,
- /*   210 */    59,  962,   23,   91,   29,   51,   50,  243,  196,   49,
- /*   220 */    48,   47,  228,  771,  232,  197,  760,  965,  763,  203,
- /*   230 */   766,  228,  771,  151,   13,  760,  204,  763,   93,  766,
- /*   240 */    90,  128,  127,  202,  951,  952,   34,  955,   60,   58,
- /*   250 */    62,   59,  966,  235,  214,  215,   51,   50,  281, 1096,
- /*   260 */    49,   48,   47,  214,  215,  337,  336,  136,   28, 1025,
- /*   270 */   333,  332,   82,   88,  250,  331,  704,  330,  329,  328,
- /*   280 */    41,  327,  326,  254,  253,  936,   35,  199,  934,  935,
- /*   290 */   142,  140,  139,  937,  876,  939,  940,  938,  178,  941,
- /*   300 */   942,   82, 1026,  257,  277,   74,  113,  107,  118,   41,
- /*   310 */   236,  334,  211,  117,  123,  126,  116,  239,  762,  193,
- /*   320 */   765,   35,  120,  242,  761,   61,  764,  233,  689, 1088,
- /*   330 */   965,  686,  772,  687,   61,  688,  968,  968,  768,  200,
- /*   340 */   115,  772,    5,   38,  168,  324,  283,  768,   79,  167,
- /*   350 */   101,   96,  100,  868,  708,  767,  261,  178,   35,  245,
- /*   360 */   246,  201,  303,   35,  767,  965,  186,  184,  182,   35,
- /*   370 */    35,   35,   89,  181,  131,  130,  129,   51,   50,   35,
- /*   380 */    35,   49,   48,   47,    1,  166,   77,  240,  967,  238,
- /*   390 */   259,  302,  301,  244,   36,  241,  701,  309,  308,  304,
- /*   400 */     3,  179,  965,    8,  305,  758,  227,  965,  737,  738,
- /*   410 */   306,  310,  311,  965,  965,  965,   67,   80,  207,   70,
- /*   420 */   312,  316,  720,  965,  965,  261,  146,  728,  729,  792,
- /*   430 */   769,   66,   25,   24,  773, 1036,  770,  690,   24,   68,
- /*   440 */    71,  759,  775,  675,  285,  208,   33,   36,   36,  288,
- /*   450 */     6,  206,  677,  287,  676,  255,   66,   92,   66,   73,
- /*   460 */    15,  664,   14,  693,  106,  694,  105,   17,  691,   16,
- /*   470 */   692,   19,  112,   18,  111,   21, 1035,   20,  125,  124,
- /*   480 */   191,  205,  195,  230,  143, 1032, 1031,  231,  315,  988,
- /*   490 */    44,  999,  996,  997, 1001,  145,  981,  262,  149,  271,
- /*   500 */  1018, 1017,  963,  162,  163,  141,  932,  961,  164,  165,
- /*   510 */   719,  879,  266,  290,  325,  160,  158,  276,  153,  978,
- /*   520 */    42,  152,   63,  189,  222,   72,  268,   39,  299,  275,
- /*   530 */   875,   69,  280,  300, 1095,  278,  103,  154, 1094,  155,
- /*   540 */   156,  274,  157, 1091,  169,  307, 1087,  109,  272, 1086,
- /*   550 */  1083,  170,  897,   40,   37,   43,  190,  864,  119,  862,
- /*   560 */   121,  122,  860,  859,  247,  180,  857,  856,  855,  854,
- /*   570 */   853,  852,  183,  185,  849,  847,  845,  843,  187,  840,
- /*   580 */   188,  270,  260,   78,   83,  269, 1019,  267,   45,  114,
- /*   590 */   317,  318,  319,  216,  321,  237,  320,  289,  322,  323,
- /*   600 */   335,  209,  817,  248,   97,   98,  210,  249,  816,  252,
- /*   610 */   815,  251,  798,  797,  256,  858,  261,  132,  173,  133,
- /*   620 */   898,  175,  171,  172,  174,  176,  177,  851,    4,  134,
- /*   630 */   850,    2,  135,  842,  841,  284,    9,   81,  696,  161,
- /*   640 */   159,   30,  147,  263,   84,  944,  224,  721,  724,   85,
- /*   650 */    10,  726,   86,  148,  273,   11,  730,  150,   31,  774,
- /*   660 */     7,   32,   12,   26,  286,   27,  776,   95,   93,  628,
- /*   670 */   624,  622,  621,  620,  617,  590,  297,   99,   64,   36,
- /*   680 */   102,  667,  666,  663,  612,  610,   65,  602,  104,  608,
- /*   690 */   604,  606,  600,  598,  631,  630,  629,  627,  626,  625,
- /*   700 */   623,  619,  618,  108,  110,   66,  588,  555,  553,  821,
- /*   710 */   820,  820,  820,  820,  820,  820,  820,  820,  820,  137,
- /*   720 */   138,
+ /*     0 */   224,  590,  235,  999,  978,  144,  978,  590,  195,  591,
+ /*    10 */   964,  826,  341,   52,   53,  591,   56,   57,  227, 1087,
+ /*    20 */   230,   46,  246,   55,  283,   60,   58,   62,   59,  218,
+ /*    30 */   339,  622,  237,   51,   50,  195,  978,   49,   48,   47,
+ /*    40 */    52,   53,   34,   56,   57,  226, 1087,  230,   46,  590,
+ /*    50 */    55,  283,   60,   58,   62,   59,  151,  591,  976,  990,
+ /*    60 */    51,   50,  228,  151,   49,   48,   47,   53,  996,   56,
+ /*    70 */    57,  266,  265,  230,   46,  259,   55,  283,   60,   58,
+ /*    80 */    62,   59,  299,   75,  220,  151,   51,   50,  975,  299,
+ /*    90 */    49,   48,   47,  543,  544,  545,  546,  547,  548,  549,
+ /*   100 */   550,  551,  552,  553,  554,  555,  340,    6,   94,  219,
+ /*   110 */    76,   52,   53,   82,   56,   57,  963,  195,  230,   46,
+ /*   120 */    41,   55,  283,   60,   58,   62,   59, 1036, 1086,  278,
+ /*   130 */   325,   51,   50,  763, 1035,   49,   48,   47,   52,   54,
+ /*   140 */    22,   56,   57,  966,  990,  230,   46,   35,   55,  283,
+ /*   150 */    60,   58,   62,   59,  280,  193,   87,  874,   51,   50,
+ /*   160 */   221,  178,   49,   48,   47,  260,   40,  297,  334,  333,
+ /*   170 */   296,  295,  294,  332,  293,  331,  330,  329,  292,  328,
+ /*   180 */   327,  938,  926,  927,  928,  929,  930,  931,  932,  933,
+ /*   190 */   934,  935,  936,  937,  939,  940,   56,   57,  146,  990,
+ /*   200 */   230,   46,  199,   55,  283,   60,   58,   62,   59,   49,
+ /*   210 */    48,   47,   23,   51,   50,  222,  727,   49,   48,   47,
+ /*   220 */   229,  778,  972,  883,  767,  115,  770,  178,  773,  204,
+ /*   230 */   325,  229,  778,  335,  907,  767,  205,  770,  769,  773,
+ /*   240 */   772,  128,  127,  203,  338,  337,  136,   15,   40,   14,
+ /*   250 */   334,  333,  215,  216,  151,  332,  282,  331,  330,  329,
+ /*   260 */   977,  328,  327,  215,  216,  946,  236,  944,  945,  590,
+ /*   270 */  1083,   34,  947,   82,  949,  950,  948,  591,  951,  952,
+ /*   280 */    41,   60,   58,   62,   59,   34,  768,  251,  771,   51,
+ /*   290 */    50,    1,  166,   49,   48,   47,  255,  254,   34,  113,
+ /*   300 */   107,  118, 1082,  258,  240,   74,  117,  123,  126,  116,
+ /*   310 */   245,  696,  212,  233,  693,  120,  694,  975,  695,    5,
+ /*   320 */    37,  168,   91,  672,   61,   88,  167,  101,   96,  100,
+ /*   330 */   779,  974,  711,   51,   50,   61,  775,   49,   48,   47,
+ /*   340 */   234,  779,  242,  243,  975,   34,   34,  775,   34,  284,
+ /*   350 */   776,  315,  314,  774,  961,  962,   33,  965,  187,  185,
+ /*   360 */   183,   89,   34,   34,  774,  182,  131,  130,  129,   34,
+ /*   370 */    34,   34, 1081,   28,  241,   77,  239, 1106,  303,  302,
+ /*   380 */   247,  700,  244,  701,  310,  309,  708,  304,  305,  875,
+ /*   390 */   306,  975,  975,  178,  975,   13,    3,  179,  777,   93,
+ /*   400 */    90,  142,  140,  139,  307,  311, 1098,   64,  975,  975,
+ /*   410 */   715,  312,  313,  317,    8,  975,  975,  975,  744,  745,
+ /*   420 */   697,   79,   80,   25,   24,  735,   24,  765,  262,  262,
+ /*   430 */    67,   70,   35,   35,   64,   92,   64,   32,  125,  124,
+ /*   440 */   289,  736,  799,  213,  780,  782,  106,   17,  105,   16,
+ /*   450 */   682,  286,  684,  288,  683,  698,   19,  699,   18,  112,
+ /*   460 */    73,  111,  671,  766,   21,  214,   20,  197,  198,  200,
+ /*   470 */   194,  201,  202,   71,   68,  208, 1046,  209,  207,  192,
+ /*   480 */   206,  196, 1045,  231, 1042, 1041,  991,  256,  232,  316,
+ /*   490 */   143,   44,  998, 1028, 1009, 1006, 1007, 1011,  263,  145,
+ /*   500 */   973,  141,  267,  149,  272, 1027,  162,  163,  223,  726,
+ /*   510 */   269,  276,  155,  152,  971,  164,  165,  886,  988,  291,
+ /*   520 */    42,  190,   38,  300,  882,   72,  301,   63,   69,  153,
+ /*   530 */  1105,  281,  154,  103, 1104,  277,  279,  156,  275,  157,
+ /*   540 */   273,  271, 1101,  169,  308, 1097,  109, 1096,  268, 1093,
+ /*   550 */   170,  904,   39,   36,   43,  161,  191,  871,  119,  869,
+ /*   560 */   121,  122,  867,  866,  248,  181,  864,  863,  862,   45,
+ /*   570 */   861,  860,  859,  184,  186,  856,  854,  852,  850,  188,
+ /*   580 */   847,  189,  326,  261,   78,   83,  114,  270, 1029,  318,
+ /*   590 */   319,  320,  321,  322,  323,  217,  238,  290,  324,  336,
+ /*   600 */   824,  210,  249,  250,   97,   98,  211,  823,  252,  253,
+ /*   610 */   822,  257,  805,  804,  262,  264,    9,  285,  177,  172,
+ /*   620 */   905,  175,  173,  171,  132,  865,  174,  176,  133,  858,
+ /*   630 */     4,  857,  942,  134,  135,  703,  906,  849,  848,   81,
+ /*   640 */     2,  158,   29,  159,  160,   84,  148,  728,  147,  225,
+ /*   650 */   731,  954,   85,   30,  733,   86,  274,   10,  737,  150,
+ /*   660 */    31,  781,   11,   95,    7,   12,   26,  783,   27,  635,
+ /*   670 */   287,  631,  629,   93,  628,  627,  624,  594,  298,   99,
+ /*   680 */    65,   35,  674,  102,   66,  673,  104,  108,  670,  616,
+ /*   690 */   110,  614,  606,  612,  608,  610,  604,  602,  638,  637,
+ /*   700 */   636,  634,  633,  632,  630,  626,  625,  180,  592,  559,
+ /*   710 */   557,  828,  827,  827,  827,  827,  827,  827,  827,  827,
+ /*   720 */   827,  827,  827,  137,  138,
 };
 static const YYCODETYPE yy_lookahead[] = {
- /*     0 */   193,    1,  192,  193,    0,  255,  212,  255,  255,    9,
- /*    10 */   190,  191,  255,   13,   14,  193,   16,   17,  265,  266,
- /*    20 */    20,   21,  255,   23,   24,   25,   26,   27,   28,  255,
- /*    30 */     5,  255,  238,   33,   34,  255,  212,   37,   38,   39,
- /*    40 */    13,   14,  266,   16,   17,  265,  266,   20,   21,    1,
- /*    50 */    23,   24,   25,   26,   27,   28,  236,    9,   33,   34,
- /*    60 */    33,   34,  238,  256,   37,   38,   39,   14,  193,   16,
- /*    70 */    17,  193,  252,   20,   21,  199,   23,   24,   25,   26,
- /*    80 */    27,   28,  260,   79,  262,  198,   33,   34,  199,  202,
+ /*     0 */   236,    1,  236,  193,  240,  193,  240,    1,  257,    9,
+ /*    10 */     0,  190,  191,   13,   14,    9,   16,   17,  267,  268,
+ /*    20 */    20,   21,  193,   23,   24,   25,   26,   27,   28,  192,
+ /*    30 */   193,    5,  236,   33,   34,  257,  240,   37,   38,   39,
+ /*    40 */    13,   14,  193,   16,   17,  267,  268,   20,   21,    1,
+ /*    50 */    23,   24,   25,   26,   27,   28,  193,    9,  229,  238,
+ /*    60 */    33,   34,   60,  193,   37,   38,   39,   14,  258,   16,
+ /*    70 */    17,  259,  260,   20,   21,  254,   23,   24,   25,   26,
+ /*    80 */    27,   28,   79,  199,  235,  193,   33,   34,  239,   79,
  /*    90 */    37,   38,   39,   45,   46,   47,   48,   49,   50,   51,
- /*   100 */    52,   53,   54,   55,   56,   57,   58,  231,   79,   61,
- /*   110 */   110,    1,  237,   13,   14,  193,   16,   17,   81,    9,
- /*   120 */    20,   21,  233,   23,   24,   25,   26,   27,   28,   37,
- /*   130 */    38,   39,  105,   33,   34,  257,  258,   37,   38,   39,
- /*   140 */    13,   14,  236,   16,   17,  255,  236,   20,   21,    1,
- /*   150 */    23,   24,   25,   26,   27,   28,  234,    9,  252,  237,
- /*   160 */    33,   34,  252,  255,   37,   38,   39,   88,   89,   90,
- /*   170 */    91,   92,   93,   94,   95,   96,   97,   98,   99,  100,
- /*   180 */   101,  102,  211,  193,  213,  214,  215,  216,  217,  218,
- /*   190 */   219,  220,  221,  222,  223,  224,  225,  226,   16,   17,
- /*   200 */   193,  255,   20,   21,  193,   23,   24,   25,   26,   27,
- /*   210 */    28,  193,   44,  199,  104,   33,   34,  193,  255,   37,
- /*   220 */    38,   39,    1,    2,  234,  255,    5,  237,    7,   61,
- /*   230 */     9,    1,    2,  193,  104,    5,   68,    7,  108,    9,
- /*   240 */   110,   73,   74,   75,  230,  231,  232,  233,   25,   26,
- /*   250 */    27,   28,  228,  235,   33,   34,   33,   34,   37,  238,
- /*   260 */    37,   38,   39,   33,   34,   65,   66,   67,   88,  262,
- /*   270 */    90,   91,  104,  262,  136,   95,   37,   97,   98,   99,
- /*   280 */   112,  101,  102,  145,  146,  211,  193,  255,  214,  215,
- /*   290 */    62,   63,   64,  219,  198,  221,  222,  223,  202,  225,
- /*   300 */   226,  104,  262,  135,  264,  137,   62,   63,   64,  112,
- /*   310 */   212,  212,  144,   69,   70,   71,   72,   68,    5,  255,
- /*   320 */     7,  193,   78,   68,    5,  104,    7,  234,    2,  238,
- /*   330 */   237,    5,  111,    7,  104,    9,  238,  238,  117,  255,
- /*   340 */    76,  111,   62,   63,   64,   81,   15,  117,  105,   69,
- /*   350 */    70,   71,   72,  198,  115,  134,  113,  202,  193,   33,
- /*   360 */    34,  255,  234,  193,  134,  237,   62,   63,   64,  193,
- /*   370 */   193,  193,  239,   69,   70,   71,   72,   33,   34,  193,
- /*   380 */   193,   37,   38,   39,  200,  201,  253,  138,  238,  140,
- /*   390 */   105,  142,  143,  138,  109,  140,  109,  142,  143,  234,
- /*   400 */   196,  197,  237,  116,  234,    1,   60,  237,  125,  126,
- /*   410 */   234,  234,  234,  237,  237,  237,  109,  105,  255,  109,
- /*   420 */   234,  234,  105,  237,  237,  113,  109,  105,  105,  105,
- /*   430 */   117,  109,  109,  109,  105,  229,  117,  111,  109,  132,
- /*   440 */   130,   37,  111,  105,  105,  255,  104,  109,  109,  107,
- /*   450 */   104,  255,  105,  105,  105,  193,  109,  109,  109,  104,
- /*   460 */   139,  106,  141,    5,  139,    7,  141,  139,    5,  141,
- /*   470 */     7,  139,  139,  141,  141,  139,  229,  141,   76,   77,
- /*   480 */   255,  255,  255,  229,  193,  229,  229,  229,  229,  193,
- /*   490 */   254,  193,  193,  193,  193,  193,  236,  236,  193,  193,
- /*   500 */   263,  263,  236,  240,  193,   60,  227,  193,  193,  193,
- /*   510 */   117,  193,  259,  193,  103,  242,  244,  122,  249,  251,
- /*   520 */   193,  250,  128,  193,  259,  129,  259,  193,  193,  259,
- /*   530 */   193,  131,  123,  193,  193,  127,  193,  248,  193,  247,
- /*   540 */   246,  121,  245,  193,  193,  193,  193,  193,  120,  193,
- /*   550 */   193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
- /*   560 */   193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+ /*   100 */    52,   53,   54,   55,   56,   57,   58,  105,  199,   61,
+ /*   110 */   110,   13,   14,  105,   16,   17,  232,  257,   20,   21,
+ /*   120 */   112,   23,   24,   25,   26,   27,   28,  264,  268,  266,
+ /*   130 */    81,   33,   34,  106,  264,   37,   38,   39,   13,   14,
+ /*   140 */   257,   16,   17,  234,  238,   20,   21,   88,   23,   24,
+ /*   150 */    25,   26,   27,   28,  262,  257,  264,  198,   33,   34,
+ /*   160 */   254,  202,   37,   38,   39,  106,   89,   90,   91,   92,
+ /*   170 */    93,   94,   95,   96,   97,   98,   99,  100,  101,  102,
+ /*   180 */   103,  213,  214,  215,  216,  217,  218,  219,  220,  221,
+ /*   190 */   222,  223,  224,  225,  226,  227,   16,   17,   88,  238,
+ /*   200 */    20,   21,  257,   23,   24,   25,   26,   27,   28,   37,
+ /*   210 */    38,   39,   44,   33,   34,  254,  106,   37,   38,   39,
+ /*   220 */     1,    2,  193,  198,    5,   76,    7,  202,    9,   61,
+ /*   230 */    81,    1,    2,  211,  212,    5,   68,    7,    5,    9,
+ /*   240 */     7,   73,   74,   75,   65,   66,   67,  139,   89,  141,
+ /*   250 */    91,   92,   33,   34,  193,   96,   37,   98,   99,  100,
+ /*   260 */   240,  102,  103,   33,   34,  213,  237,  215,  216,    1,
+ /*   270 */   257,  193,  220,  105,  222,  223,  224,    9,  226,  227,
+ /*   280 */   112,   25,   26,   27,   28,  193,    5,  136,    7,   33,
+ /*   290 */    34,  200,  201,   37,   38,   39,  145,  146,  193,   62,
+ /*   300 */    63,   64,  257,  135,   68,  137,   69,   70,   71,   72,
+ /*   310 */    68,    2,  144,  235,    5,   78,    7,  239,    9,   62,
+ /*   320 */    63,   64,  199,    5,  105,  264,   69,   70,   71,   72,
+ /*   330 */   111,  239,   37,   33,   34,  105,  117,   37,   38,   39,
+ /*   340 */   235,  111,   33,   34,  239,  193,  193,  117,  193,   15,
+ /*   350 */   117,   33,   34,  134,  231,  232,  233,  234,   62,   63,
+ /*   360 */    64,  241,  193,  193,  134,   69,   70,   71,   72,  193,
+ /*   370 */   193,  193,  257,  105,  138,  255,  140,  240,  142,  143,
+ /*   380 */   138,    5,  140,    7,  142,  143,   88,  235,  235,  198,
+ /*   390 */   235,  239,  239,  202,  239,  105,  196,  197,  117,  109,
+ /*   400 */   110,   62,   63,   64,  235,  235,  240,   88,  239,  239,
+ /*   410 */   115,  235,  235,  235,  116,  239,  239,  239,  125,  126,
+ /*   420 */   111,  106,  106,   88,   88,  106,   88,    1,  113,  113,
+ /*   430 */    88,   88,   88,   88,   88,   88,   88,  105,   76,   77,
+ /*   440 */   108,  106,  106,  257,  106,  111,  139,  139,  141,  141,
+ /*   450 */   106,  106,  106,  106,  106,    5,  139,    7,  141,  139,
+ /*   460 */   105,  141,  107,   37,  139,  257,  141,  257,  257,  257,
+ /*   470 */   257,  257,  257,  130,  132,  257,  230,  257,  257,  257,
+ /*   480 */   257,  257,  230,  230,  230,  230,  238,  193,  230,  230,
+ /*   490 */   193,  256,  193,  265,  193,  193,  193,  193,  238,  193,
+ /*   500 */   238,   60,  261,  193,  193,  265,  242,  193,  261,  117,
+ /*   510 */   261,  261,  249,  252,  193,  193,  193,  193,  253,  193,
+ /*   520 */   193,  193,  193,  193,  193,  129,  193,  128,  131,  251,
+ /*   530 */   193,  123,  250,  193,  193,  122,  127,  248,  121,  247,
+ /*   540 */   120,  119,  193,  193,  193,  193,  193,  193,  118,  193,
+ /*   550 */   193,  193,  193,  193,  193,  243,  193,  193,  193,  193,
+ /*   560 */   193,  193,  193,  193,  193,  193,  193,  193,  193,  133,
  /*   570 */   193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
- /*   580 */   193,  119,  194,  194,  194,  194,  194,  118,  133,   87,
- /*   590 */    86,   50,   83,  194,   54,  194,   85,  194,   84,   82,
- /*   600 */    79,  194,    5,  147,  199,  199,  194,    5,    5,    5,
- /*   610 */     5,  147,   90,   89,  136,  194,  113,  195,  204,  195,
- /*   620 */   210,  205,  209,  208,  207,  206,  203,  194,  196,  195,
- /*   630 */   194,  200,  195,  194,  194,  107,  104,  114,  105,  241,
- /*   640 */   243,  104,  104,  109,  109,  227,    1,  105,  105,  104,
- /*   650 */   124,  105,  104,  109,  104,  124,  105,  104,  109,  105,
- /*   660 */   104,  109,  104,  104,  107,  104,  111,   76,  108,    9,
- /*   670 */     5,    5,    5,    5,    5,   80,   15,   76,   16,  109,
- /*   680 */   141,    5,    5,  105,    5,    5,   16,    5,  141,    5,
- /*   690 */     5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
- /*   700 */     5,    5,    5,  141,  141,  109,   80,   60,   59,    0,
- /*   710 */   267,  267,  267,  267,  267,  267,  267,  267,  267,   21,
- /*   720 */    21,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   730 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   740 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   750 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   760 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   770 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   780 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   790 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   800 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   810 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   820 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   830 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   840 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   850 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   860 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   870 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   880 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   890 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   900 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+ /*   580 */   193,  193,  104,  194,  194,  194,   87,  194,  194,   86,
+ /*   590 */    50,   83,   85,   54,   84,  194,  194,  194,   82,   79,
+ /*   600 */     5,  194,  147,    5,  199,  199,  194,    5,  147,    5,
+ /*   610 */     5,  136,   91,   90,  113,   88,  105,  108,  203,  208,
+ /*   620 */   210,  205,  204,  209,  195,  194,  207,  206,  195,  194,
+ /*   630 */   196,  194,  228,  195,  195,  106,  212,  194,  194,  114,
+ /*   640 */   200,  246,  105,  245,  244,   88,   88,  106,  105,    1,
+ /*   650 */   106,  228,  105,   88,  106,  105,  105,  124,  106,  105,
+ /*   660 */    88,  106,  124,   76,  105,  105,  105,  111,  105,    9,
+ /*   670 */   108,    5,    5,  109,    5,    5,    5,   80,   15,   76,
+ /*   680 */    16,   88,    5,  141,   16,    5,  141,  141,  106,    5,
+ /*   690 */   141,    5,    5,    5,    5,    5,    5,    5,    5,    5,
+ /*   700 */     5,    5,    5,    5,    5,    5,    5,   88,   80,   60,
+ /*   710 */    59,    0,  269,  269,  269,  269,  269,  269,  269,  269,
+ /*   720 */   269,  269,  269,   21,   21,  269,  269,  269,  269,  269,
+ /*   730 */   269,  269,  269,  269,  269,  269,  269,  269,  269,  269,
+ /*   740 */   269,  269,  269,  269,  269,  269,  269,  269,  269,  269,
+ /*   750 */   269,  269,  269,  269,  269,  269,  269,  269,  269,  269,
+ /*   760 */   269,  269,  269,  269,  269,  269,  269,  269,  269,  269,
+ /*   770 */   269,  269,  269,  269,  269,  269,  269,  269,  269,  269,
+ /*   780 */   269,  269,  269,  269,  269,  269,  269,  269,  269,  269,
+ /*   790 */   269,  269,  269,  269,  269,  269,  269,  269,  269,  269,
+ /*   800 */   269,  269,  269,  269,  269,  269,  269,  269,  269,  269,
+ /*   810 */   269,  269,  269,  269,  269,  269,  269,  269,  269,  269,
+ /*   820 */   269,  269,  269,  269,  269,  269,  269,  269,  269,  269,
+ /*   830 */   269,  269,  269,  269,  269,  269,  269,  269,  269,  269,
+ /*   840 */   269,  269,  269,  269,  269,  269,  269,  269,  269,  269,
+ /*   850 */   269,  269,  269,  269,  269,  269,  269,  269,  269,  269,
+ /*   860 */   269,  269,  269,  269,  269,  269,  269,  269,  269,  269,
+ /*   870 */   269,  269,  269,  269,  269,  269,  269,  269,  269,  269,
+ /*   880 */   269,  269,  269,  269,  269,  269,  269,  269,  269,  269,
+ /*   890 */   269,  269,  269,  269,  269,  269,  269,  269,  269,  269,
+ /*   900 */   269,  269,  269,  269,  269,  269,  269,  269,  269,  269,
+ /*   910 */   269,  269,  269,  269,
 };
-#define YY_SHIFT_COUNT    (340)
+#define YY_SHIFT_COUNT    (341)
 #define YY_SHIFT_MIN      (0)
-#define YY_SHIFT_MAX      (709)
+#define YY_SHIFT_MAX      (711)
 static const unsigned short int yy_shift_ofst[] = {
- /*     0 */   168,   79,   79,  180,  180,   29,  221,  230,  110,  148,
- /*    10 */   148,  148,  148,  148,  148,  148,  148,  148,  148,  148,
- /*    20 */   148,  148,    0,   48,  230,  326,  326,  326,  326,  197,
- /*    30 */   197,  148,  148,  148,    4,  148,  148,  264,   29,   37,
- /*    40 */    37,  721,  721,  721,  230,  230,  230,  230,  230,  230,
+ /*     0 */   168,   77,   77,  159,  159,    3,  219,  230,  268,    6,
+ /*    10 */     6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+ /*    20 */     6,    6,    0,   48,  230,  309,  309,  309,    8,    8,
+ /*    30 */     6,    6,    6,   10,    6,    6,  149,    3,   49,   49,
+ /*    40 */    26,  725,  725,  725,  230,  230,  230,  230,  230,  230,
  /*    50 */   230,  230,  230,  230,  230,  230,  230,  230,  230,  230,
- /*    60 */   230,  230,  230,  230,  326,  326,  326,   25,   25,   25,
- /*    70 */    25,   25,   25,   25,  148,  148,  148,  239,  148,  148,
- /*    80 */   148,  197,  197,  148,  148,  148,  148,  283,  283,  287,
- /*    90 */   197,  148,  148,  148,  148,  148,  148,  148,  148,  148,
- /*   100 */   148,  148,  148,  148,  148,  148,  148,  148,  148,  148,
- /*   110 */   148,  148,  148,  148,  148,  148,  148,  148,  148,  148,
- /*   120 */   148,  148,  148,  148,  148,  148,  148,  148,  148,  148,
- /*   130 */   148,  148,  148,  148,  148,  148,  148,  148,  148,  148,
- /*   140 */   148,  148,  148,  445,  445,  445,  393,  393,  393,  445,
- /*   150 */   393,  445,  396,  400,  394,  409,  408,  395,  420,  428,
- /*   160 */   462,  469,  455,  445,  445,  445,  411,   29,   29,  445,
- /*   170 */   445,  502,  504,  541,  509,  511,  540,  514,  517,  411,
- /*   180 */   445,  521,  521,  445,  521,  445,  521,  445,  445,  721,
- /*   190 */   721,   27,  100,  127,  100,  100,   53,  182,  223,  223,
- /*   200 */   223,  223,  244,  280,  304,  344,  344,  344,  344,  249,
- /*   210 */   255,  138,   92,   92,  313,  319,  130,  200,  228,  285,
- /*   220 */   243,  312,  317,  322,  323,  324,  329,  404,  346,  331,
- /*   230 */   307,  310,  338,  339,  347,  348,  349,  342,  321,  325,
- /*   240 */   328,  332,  333,  355,  336,  458,  463,  402,  597,  456,
- /*   250 */   602,  603,  464,  604,  605,  522,  524,  478,  503,  528,
- /*   260 */   532,  523,  533,  537,  534,  535,  542,  538,  543,  544,
- /*   270 */   545,  546,  548,  645,  550,  551,  553,  549,  526,  552,
- /*   280 */   531,  554,  556,  555,  558,  528,  559,  557,  561,  560,
- /*   290 */   591,  660,  665,  666,  667,  668,  669,  595,  661,  601,
- /*   300 */   662,  539,  547,  570,  570,  570,  570,  670,  562,  563,
- /*   310 */   570,  570,  570,  676,  677,  578,  570,  679,  680,  682,
- /*   320 */   684,  685,  686,  687,  688,  689,  690,  691,  692,  693,
- /*   330 */   694,  695,  696,  697,  596,  626,  698,  699,  647,  649,
- /*   340 */   709,
+ /*    60 */   230,  230,  230,  230,  309,  309,  309,  318,  318,  318,
+ /*    70 */   318,  318,  318,  318,    6,    6,    6,  295,    6,    6,
+ /*    80 */     6,    8,    8,    6,    6,    6,    6,  293,  293,  298,
+ /*    90 */     8,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+ /*   100 */     6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+ /*   110 */     6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+ /*   120 */     6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+ /*   130 */     6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+ /*   140 */     6,    6,    6,  441,  441,  441,  392,  392,  392,  441,
+ /*   150 */   392,  441,  396,  397,  399,  408,  409,  413,  417,  420,
+ /*   160 */   422,  430,  436,  441,  441,  441,  478,    3,    3,  441,
+ /*   170 */   441,  499,  503,  540,  508,  507,  539,  510,  516,  478,
+ /*   180 */    26,  441,  520,  520,  441,  520,  441,  520,  441,  441,
+ /*   190 */   725,  725,   27,   98,  125,   98,   98,   53,  180,  256,
+ /*   200 */   256,  256,  256,  237,  257,  296,  300,  300,  300,  300,
+ /*   210 */   236,  242,  151,  172,  172,  233,  281,  290,  179,  339,
+ /*   220 */    59,  315,  316,  110,  319,  335,  336,  338,  426,    2,
+ /*   230 */   334,  342,  343,  344,  345,  346,  347,  348,  332,  108,
+ /*   240 */   307,  308,  376,  450,  317,  320,  355,  325,  362,  595,
+ /*   250 */   455,  598,  602,  461,  604,  605,  521,  523,  475,  501,
+ /*   260 */   509,  511,  525,  529,  537,  527,  557,  541,  543,  544,
+ /*   270 */   558,  547,  548,  550,  648,  551,  552,  554,  565,  533,
+ /*   280 */   572,  538,  555,  559,  556,  560,  509,  561,  562,  563,
+ /*   290 */   564,  587,  660,  666,  667,  669,  670,  671,  597,  663,
+ /*   300 */   603,  664,  542,  545,  593,  593,  593,  593,  668,  546,
+ /*   310 */   549,  593,  593,  593,  677,  680,  582,  593,  684,  686,
+ /*   320 */   687,  688,  689,  690,  691,  692,  693,  694,  695,  696,
+ /*   330 */   697,  698,  699,  700,  701,  619,  628,  702,  703,  649,
+ /*   340 */   651,  711,
 };
-#define YY_REDUCE_COUNT (190)
-#define YY_REDUCE_MIN   (-250)
-#define YY_REDUCE_MAX   (440)
+#define YY_REDUCE_COUNT (191)
+#define YY_REDUCE_MIN   (-249)
+#define YY_REDUCE_MAX   (444)
 static const short yy_reduce_ofst[] = {
- /*     0 */  -180,  -29,  -29,   74,   74,   14, -247, -220, -122,  -78,
- /*    10 */    40, -178,  -10,   93,  128,  165,  170,  176,  177,  178,
- /*    20 */   186,  187, -193, -190, -224, -206, -176,   98,   99,  -94,
- /*    30 */   -90,    7,   11,   18, -111,   24, -125, -113, -124,   96,
- /*    40 */   155,  133,  184,  204, -250, -248, -243, -233, -226, -110,
- /*    50 */   -92,  -54,  -37,  -30,   32,   64,   84,  106,  163,  190,
- /*    60 */   196,  225,  226,  227,   21,   91,  150,  206,  247,  254,
- /*    70 */   256,  257,  258,  259,  262,  291,  296,  236,  298,  299,
- /*    80 */   300,  260,  261,  301,  302,  305,  306,  237,  238,  263,
- /*    90 */   266,  311,  314,  315,  316,  318,  320,  327,  330,  334,
- /*   100 */   335,  337,  340,  341,  343,  345,  350,  351,  352,  353,
- /*   110 */   354,  356,  357,  358,  359,  360,  361,  362,  363,  364,
+ /*     0 */  -179,  -32,  -32,   52,   52,  123, -249, -222, -188, -151,
+ /*    10 */  -137, -108,   78,  105,  152,  153,  155,  169,  170,  176,
+ /*    20 */   177,  178, -190, -163, -140, -236, -234, -204,  -94,  -39,
+ /*    30 */  -130,   61,   29,  -91, -171,   92,  -41, -116,   25,  191,
+ /*    40 */    22,  120,   91,  200, -117, -102,  -55,   13,   45,  115,
+ /*    50 */   186,  208,  210,  211,  212,  213,  214,  215,  218,  220,
+ /*    60 */   221,  222,  223,  224,   20,  137,  166,  246,  252,  253,
+ /*    70 */   254,  255,  258,  259,  294,  297,  299,  235,  301,  302,
+ /*    80 */   303,  248,  260,  304,  306,  310,  311,  228,  240,  264,
+ /*    90 */   262,  314,  321,  322,  323,  324,  326,  327,  328,  329,
+ /*   100 */   330,  331,  333,  337,  340,  341,  349,  350,  351,  352,
+ /*   110 */   353,  354,  356,  357,  358,  359,  360,  361,  363,  364,
  /*   120 */   365,  366,  367,  368,  369,  370,  371,  372,  373,  374,
- /*   130 */   375,  376,  377,  378,  379,  380,  381,  382,  383,  384,
- /*   140 */   385,  386,  387,  388,  389,  390,  253,  265,  267,  391,
- /*   150 */   270,  392,  268,  271,  269,  289,  292,  294,  297,  272,
- /*   160 */   397,  273,  398,  399,  401,  403,  279,  405,  406,  407,
- /*   170 */   412,  410,  413,  415,  414,  417,  416,  419,  423,  418,
- /*   180 */   421,  422,  424,  433,  434,  436,  437,  439,  440,  431,
- /*   190 */   432,
+ /*   130 */   375,  377,  378,  379,  380,  381,  382,  383,  384,  385,
+ /*   140 */   386,  387,  388,  389,  390,  391,  241,  247,  249,  393,
+ /*   150 */   250,  394,  265,  261,  278,  282,  263,  289,  292,  395,
+ /*   160 */   398,  400,  312,  401,  402,  403,  404,  405,  406,  407,
+ /*   170 */   412,  410,  414,  411,  418,  419,  416,  421,  415,  423,
+ /*   180 */   424,  431,  429,  433,  435,  438,  437,  439,  443,  444,
+ /*   190 */   440,  434,
 };
 static const YYACTIONTYPE yy_default[] = {
- /*     0 */   818,  931,  877,  943,  865,  874, 1079, 1079,  818,  818,
- /*    10 */   818,  818,  818,  818,  818,  818,  818,  818,  818,  818,
- /*    20 */   818,  818,  990,  837, 1079,  818,  818,  818,  818,  818,
- /*    30 */   818,  818,  818,  818,  874,  818,  818,  880,  874,  880,
- /*    40 */   880,  985,  915,  933,  818,  818,  818,  818,  818,  818,
- /*    50 */   818,  818,  818,  818,  818,  818,  818,  818,  818,  818,
- /*    60 */   818,  818,  818,  818,  818,  818,  818,  818,  818,  818,
- /*    70 */   818,  818,  818,  818,  818,  818,  818,  992,  998,  995,
- /*    80 */   818,  818,  818, 1000,  818,  818,  818, 1022, 1022,  983,
- /*    90 */   818,  818,  818,  818,  818,  818,  818,  818,  818,  818,
- /*   100 */   818,  818,  818,  818,  818,  818,  818,  818,  818,  818,
- /*   110 */   818,  818,  818,  818,  818,  818,  818,  818,  818,  863,
- /*   120 */   818,  861,  818,  818,  818,  818,  818,  818,  818,  818,
- /*   130 */   818,  818,  818,  818,  818,  818,  848,  818,  818,  818,
- /*   140 */   818,  818,  818,  839,  839,  839,  818,  818,  818,  839,
- /*   150 */   818,  839, 1029, 1033, 1027, 1015, 1023, 1014, 1010, 1008,
- /*   160 */  1006, 1005, 1037,  839,  839,  839,  878,  874,  874,  839,
- /*   170 */   839,  896,  894,  892,  884,  890,  886,  888,  882,  866,
- /*   180 */   839,  872,  872,  839,  872,  839,  872,  839,  839,  915,
- /*   190 */   933,  818, 1038,  818, 1078, 1028, 1068, 1067, 1074, 1066,
- /*   200 */  1065, 1064,  818,  818,  818, 1060, 1061, 1063, 1062,  818,
- /*   210 */   818,  818, 1070, 1069,  818,  818,  818,  818,  818,  818,
- /*   220 */   818,  818,  818,  818,  818,  818,  818,  818, 1040,  818,
- /*   230 */  1034, 1030,  818,  818,  818,  818,  818,  818,  818,  818,
- /*   240 */   818,  818,  818,  945,  818,  818,  818,  818,  818,  818,
- /*   250 */   818,  818,  818,  818,  818,  818,  818,  818,  982,  818,
- /*   260 */   818,  818,  818,  818,  994,  993,  818,  818,  818,  818,
- /*   270 */   818,  818,  818,  818,  818,  818,  818, 1024,  818, 1016,
- /*   280 */   818,  818,  818,  818,  818,  957,  818,  818,  818,  818,
- /*   290 */   818,  818,  818,  818,  818,  818,  818,  818,  818,  818,
- /*   300 */   818,  818,  818, 1097, 1092, 1093, 1090,  818,  818,  818,
- /*   310 */  1089, 1084, 1085,  818,  818,  818, 1082,  818,  818,  818,
- /*   320 */   818,  818,  818,  818,  818,  818,  818,  818,  818,  818,
- /*   330 */   818,  818,  818,  818,  899,  818,  846,  844,  818,  835,
- /*   340 */   818,
+ /*     0 */   825,  941,  884,  953,  872,  881, 1089, 1089,  825,  825,
+ /*    10 */   825,  825,  825,  825,  825,  825,  825,  825,  825,  825,
+ /*    20 */   825,  825, 1000,  844, 1089,  825,  825,  825,  825,  825,
+ /*    30 */   825,  825,  825,  881,  825,  825,  887,  881,  887,  887,
+ /*    40 */   825,  995,  925,  943,  825,  825,  825,  825,  825,  825,
+ /*    50 */   825,  825,  825,  825,  825,  825,  825,  825,  825,  825,
+ /*    60 */   825,  825,  825,  825,  825,  825,  825,  825,  825,  825,
+ /*    70 */   825,  825,  825,  825,  825,  825,  825, 1002, 1008, 1005,
+ /*    80 */   825,  825,  825, 1010,  825,  825,  825, 1032, 1032,  993,
+ /*    90 */   825,  825,  825,  825,  825,  825,  825,  825,  825,  825,
+ /*   100 */   825,  825,  825,  825,  825,  825,  825,  825,  825,  825,
+ /*   110 */   825,  825,  825,  825,  825,  825,  825,  825,  825,  870,
+ /*   120 */   825,  868,  825,  825,  825,  825,  825,  825,  825,  825,
+ /*   130 */   825,  825,  825,  825,  825,  825,  855,  825,  825,  825,
+ /*   140 */   825,  825,  825,  846,  846,  846,  825,  825,  825,  846,
+ /*   150 */   825,  846, 1039, 1043, 1037, 1025, 1033, 1024, 1020, 1018,
+ /*   160 */  1016, 1015, 1047,  846,  846,  846,  885,  881,  881,  846,
+ /*   170 */   846,  903,  901,  899,  891,  897,  893,  895,  889,  873,
+ /*   180 */   825,  846,  879,  879,  846,  879,  846,  879,  846,  846,
+ /*   190 */   925,  943,  825, 1048,  825, 1088, 1038, 1078, 1077, 1084,
+ /*   200 */  1076, 1075, 1074,  825,  825,  825, 1070, 1071, 1073, 1072,
+ /*   210 */   825,  825,  825, 1080, 1079,  825,  825,  825,  825,  825,
+ /*   220 */   825,  825,  825,  825,  825,  825,  825,  825,  825, 1050,
+ /*   230 */   825, 1044, 1040,  825,  825,  825,  825,  825,  825,  825,
+ /*   240 */   825,  825,  825,  825,  825,  825,  955,  825,  825,  825,
+ /*   250 */   825,  825,  825,  825,  825,  825,  825,  825,  825,  992,
+ /*   260 */   825,  825,  825,  825,  825, 1004, 1003,  825,  825,  825,
+ /*   270 */   825,  825,  825,  825,  825,  825,  825,  825, 1034,  825,
+ /*   280 */  1026,  825,  825,  825,  825,  825,  967,  825,  825,  825,
+ /*   290 */   825,  825,  825,  825,  825,  825,  825,  825,  825,  825,
+ /*   300 */   825,  825,  825,  825, 1107, 1102, 1103, 1100,  825,  825,
+ /*   310 */   825, 1099, 1094, 1095,  825,  825,  825, 1092,  825,  825,
+ /*   320 */   825,  825,  825,  825,  825,  825,  825,  825,  825,  825,
+ /*   330 */   825,  825,  825,  825,  825,  909,  825,  853,  851,  825,
+ /*   340 */   842,  825,
 };
 /********** End of lemon-generated parsing tables *****************************/
 
@@ -581,6 +582,7 @@ static const YYCODETYPE yyFallback[] = {
     0,  /*      QTIME => nothing */
     0,  /*      CONNS => nothing */
     0,  /*      STATE => nothing */
+    0,  /*      COMMA => nothing */
     0,  /*       KEEP => nothing */
     0,  /*      CACHE => nothing */
     0,  /*    REPLICA => nothing */
@@ -602,7 +604,6 @@ static const YYCODETYPE yyFallback[] = {
     0,  /*   UNSIGNED => nothing */
     0,  /*       TAGS => nothing */
     0,  /*      USING => nothing */
-    0,  /*      COMMA => nothing */
     0,  /*         AS => nothing */
     1,  /*       NULL => ID */
     0,  /*     SELECT => nothing */
@@ -856,28 +857,28 @@ static const char *const yyTokenName[] = {
   /*   85 */ "QTIME",
   /*   86 */ "CONNS",
   /*   87 */ "STATE",
-  /*   88 */ "KEEP",
-  /*   89 */ "CACHE",
-  /*   90 */ "REPLICA",
-  /*   91 */ "QUORUM",
-  /*   92 */ "DAYS",
-  /*   93 */ "MINROWS",
-  /*   94 */ "MAXROWS",
-  /*   95 */ "BLOCKS",
-  /*   96 */ "CTIME",
-  /*   97 */ "WAL",
-  /*   98 */ "FSYNC",
-  /*   99 */ "COMP",
-  /*  100 */ "PRECISION",
-  /*  101 */ "UPDATE",
-  /*  102 */ "CACHELAST",
-  /*  103 */ "PARTITIONS",
-  /*  104 */ "LP",
-  /*  105 */ "RP",
-  /*  106 */ "UNSIGNED",
-  /*  107 */ "TAGS",
-  /*  108 */ "USING",
-  /*  109 */ "COMMA",
+  /*   88 */ "COMMA",
+  /*   89 */ "KEEP",
+  /*   90 */ "CACHE",
+  /*   91 */ "REPLICA",
+  /*   92 */ "QUORUM",
+  /*   93 */ "DAYS",
+  /*   94 */ "MINROWS",
+  /*   95 */ "MAXROWS",
+  /*   96 */ "BLOCKS",
+  /*   97 */ "CTIME",
+  /*   98 */ "WAL",
+  /*   99 */ "FSYNC",
+  /*  100 */ "COMP",
+  /*  101 */ "PRECISION",
+  /*  102 */ "UPDATE",
+  /*  103 */ "CACHELAST",
+  /*  104 */ "PARTITIONS",
+  /*  105 */ "LP",
+  /*  106 */ "RP",
+  /*  107 */ "UNSIGNED",
+  /*  108 */ "TAGS",
+  /*  109 */ "USING",
   /*  110 */ "AS",
   /*  111 */ "NULL",
   /*  112 */ "SELECT",
@@ -979,62 +980,64 @@ static const char *const yyTokenName[] = {
   /*  208 */ "users",
   /*  209 */ "conns",
   /*  210 */ "state",
-  /*  211 */ "keep",
-  /*  212 */ "tagitemlist",
-  /*  213 */ "cache",
-  /*  214 */ "replica",
-  /*  215 */ "quorum",
-  /*  216 */ "days",
-  /*  217 */ "minrows",
-  /*  218 */ "maxrows",
-  /*  219 */ "blocks",
-  /*  220 */ "ctime",
-  /*  221 */ "wal",
-  /*  222 */ "fsync",
-  /*  223 */ "comp",
-  /*  224 */ "prec",
-  /*  225 */ "update",
-  /*  226 */ "cachelast",
-  /*  227 */ "partitions",
-  /*  228 */ "typename",
-  /*  229 */ "signed",
-  /*  230 */ "create_table_args",
-  /*  231 */ "create_stable_args",
-  /*  232 */ "create_table_list",
-  /*  233 */ "create_from_stable",
-  /*  234 */ "columnlist",
-  /*  235 */ "tagNamelist",
-  /*  236 */ "select",
-  /*  237 */ "column",
-  /*  238 */ "tagitem",
-  /*  239 */ "selcollist",
-  /*  240 */ "from",
-  /*  241 */ "where_opt",
-  /*  242 */ "interval_opt",
-  /*  243 */ "session_option",
-  /*  244 */ "windowstate_option",
-  /*  245 */ "fill_opt",
-  /*  246 */ "sliding_opt",
-  /*  247 */ "groupby_opt",
-  /*  248 */ "orderby_opt",
-  /*  249 */ "having_opt",
-  /*  250 */ "slimit_opt",
-  /*  251 */ "limit_opt",
-  /*  252 */ "union",
-  /*  253 */ "sclp",
-  /*  254 */ "distinct",
-  /*  255 */ "expr",
-  /*  256 */ "as",
-  /*  257 */ "tablelist",
-  /*  258 */ "sub",
-  /*  259 */ "tmvar",
-  /*  260 */ "sortlist",
-  /*  261 */ "sortitem",
-  /*  262 */ "item",
-  /*  263 */ "sortorder",
-  /*  264 */ "grouplist",
-  /*  265 */ "exprlist",
-  /*  266 */ "expritem",
+  /*  211 */ "intitemlist",
+  /*  212 */ "intitem",
+  /*  213 */ "keep",
+  /*  214 */ "cache",
+  /*  215 */ "replica",
+  /*  216 */ "quorum",
+  /*  217 */ "days",
+  /*  218 */ "minrows",
+  /*  219 */ "maxrows",
+  /*  220 */ "blocks",
+  /*  221 */ "ctime",
+  /*  222 */ "wal",
+  /*  223 */ "fsync",
+  /*  224 */ "comp",
+  /*  225 */ "prec",
+  /*  226 */ "update",
+  /*  227 */ "cachelast",
+  /*  228 */ "partitions",
+  /*  229 */ "typename",
+  /*  230 */ "signed",
+  /*  231 */ "create_table_args",
+  /*  232 */ "create_stable_args",
+  /*  233 */ "create_table_list",
+  /*  234 */ "create_from_stable",
+  /*  235 */ "columnlist",
+  /*  236 */ "tagitemlist",
+  /*  237 */ "tagNamelist",
+  /*  238 */ "select",
+  /*  239 */ "column",
+  /*  240 */ "tagitem",
+  /*  241 */ "selcollist",
+  /*  242 */ "from",
+  /*  243 */ "where_opt",
+  /*  244 */ "interval_opt",
+  /*  245 */ "session_option",
+  /*  246 */ "windowstate_option",
+  /*  247 */ "fill_opt",
+  /*  248 */ "sliding_opt",
+  /*  249 */ "groupby_opt",
+  /*  250 */ "orderby_opt",
+  /*  251 */ "having_opt",
+  /*  252 */ "slimit_opt",
+  /*  253 */ "limit_opt",
+  /*  254 */ "union",
+  /*  255 */ "sclp",
+  /*  256 */ "distinct",
+  /*  257 */ "expr",
+  /*  258 */ "as",
+  /*  259 */ "tablelist",
+  /*  260 */ "sub",
+  /*  261 */ "tmvar",
+  /*  262 */ "sortlist",
+  /*  263 */ "sortitem",
+  /*  264 */ "item",
+  /*  265 */ "sortorder",
+  /*  266 */ "grouplist",
+  /*  267 */ "exprlist",
+  /*  268 */ "expritem",
 };
 #endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */
 
@@ -1120,208 +1123,211 @@ static const char *const yyRuleName[] = {
  /*  75 */ "state ::=",
  /*  76 */ "state ::= STATE ids",
  /*  77 */ "acct_optr ::= pps tseries storage streams qtime dbs users conns state",
- /*  78 */ "keep ::= KEEP tagitemlist",
- /*  79 */ "cache ::= CACHE INTEGER",
- /*  80 */ "replica ::= REPLICA INTEGER",
- /*  81 */ "quorum ::= QUORUM INTEGER",
- /*  82 */ "days ::= DAYS INTEGER",
- /*  83 */ "minrows ::= MINROWS INTEGER",
- /*  84 */ "maxrows ::= MAXROWS INTEGER",
- /*  85 */ "blocks ::= BLOCKS INTEGER",
- /*  86 */ "ctime ::= CTIME INTEGER",
- /*  87 */ "wal ::= WAL INTEGER",
- /*  88 */ "fsync ::= FSYNC INTEGER",
- /*  89 */ "comp ::= COMP INTEGER",
- /*  90 */ "prec ::= PRECISION STRING",
- /*  91 */ "update ::= UPDATE INTEGER",
- /*  92 */ "cachelast ::= CACHELAST INTEGER",
- /*  93 */ "partitions ::= PARTITIONS INTEGER",
- /*  94 */ "db_optr ::=",
- /*  95 */ "db_optr ::= db_optr cache",
- /*  96 */ "db_optr ::= db_optr replica",
- /*  97 */ "db_optr ::= db_optr quorum",
- /*  98 */ "db_optr ::= db_optr days",
- /*  99 */ "db_optr ::= db_optr minrows",
- /* 100 */ "db_optr ::= db_optr maxrows",
- /* 101 */ "db_optr ::= db_optr blocks",
- /* 102 */ "db_optr ::= db_optr ctime",
- /* 103 */ "db_optr ::= db_optr wal",
- /* 104 */ "db_optr ::= db_optr fsync",
- /* 105 */ "db_optr ::= db_optr comp",
- /* 106 */ "db_optr ::= db_optr prec",
- /* 107 */ "db_optr ::= db_optr keep",
- /* 108 */ "db_optr ::= db_optr update",
- /* 109 */ "db_optr ::= db_optr cachelast",
- /* 110 */ "topic_optr ::= db_optr",
- /* 111 */ "topic_optr ::= topic_optr partitions",
- /* 112 */ "alter_db_optr ::=",
- /* 113 */ "alter_db_optr ::= alter_db_optr replica",
- /* 114 */ "alter_db_optr ::= alter_db_optr quorum",
- /* 115 */ "alter_db_optr ::= alter_db_optr keep",
- /* 116 */ "alter_db_optr ::= alter_db_optr blocks",
- /* 117 */ "alter_db_optr ::= alter_db_optr comp",
- /* 118 */ "alter_db_optr ::= alter_db_optr wal",
- /* 119 */ "alter_db_optr ::= alter_db_optr fsync",
- /* 120 */ "alter_db_optr ::= alter_db_optr update",
- /* 121 */ "alter_db_optr ::= alter_db_optr cachelast",
- /* 122 */ "alter_topic_optr ::= alter_db_optr",
- /* 123 */ "alter_topic_optr ::= alter_topic_optr partitions",
- /* 124 */ "typename ::= ids",
- /* 125 */ "typename ::= ids LP signed RP",
- /* 126 */ "typename ::= ids UNSIGNED",
- /* 127 */ "signed ::= INTEGER",
- /* 128 */ "signed ::= PLUS INTEGER",
- /* 129 */ "signed ::= MINUS INTEGER",
- /* 130 */ "cmd ::= CREATE TABLE create_table_args",
- /* 131 */ "cmd ::= CREATE TABLE create_stable_args",
- /* 132 */ "cmd ::= CREATE STABLE create_stable_args",
- /* 133 */ "cmd ::= CREATE TABLE create_table_list",
- /* 134 */ "create_table_list ::= create_from_stable",
- /* 135 */ "create_table_list ::= create_table_list create_from_stable",
- /* 136 */ "create_table_args ::= ifnotexists ids cpxName LP columnlist RP",
- /* 137 */ "create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP",
- /* 138 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP",
- /* 139 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP",
- /* 140 */ "tagNamelist ::= tagNamelist COMMA ids",
- /* 141 */ "tagNamelist ::= ids",
- /* 142 */ "create_table_args ::= ifnotexists ids cpxName AS select",
- /* 143 */ "columnlist ::= columnlist COMMA column",
- /* 144 */ "columnlist ::= column",
- /* 145 */ "column ::= ids typename",
- /* 146 */ "tagitemlist ::= tagitemlist COMMA tagitem",
- /* 147 */ "tagitemlist ::= tagitem",
- /* 148 */ "tagitem ::= INTEGER",
- /* 149 */ "tagitem ::= FLOAT",
- /* 150 */ "tagitem ::= STRING",
- /* 151 */ "tagitem ::= BOOL",
- /* 152 */ "tagitem ::= NULL",
- /* 153 */ "tagitem ::= MINUS INTEGER",
- /* 154 */ "tagitem ::= MINUS FLOAT",
- /* 155 */ "tagitem ::= PLUS INTEGER",
- /* 156 */ "tagitem ::= PLUS FLOAT",
- /* 157 */ "select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt",
- /* 158 */ "select ::= LP select RP",
- /* 159 */ "union ::= select",
- /* 160 */ "union ::= union UNION ALL select",
- /* 161 */ "cmd ::= union",
- /* 162 */ "select ::= SELECT selcollist",
- /* 163 */ "sclp ::= selcollist COMMA",
- /* 164 */ "sclp ::=",
- /* 165 */ "selcollist ::= sclp distinct expr as",
- /* 166 */ "selcollist ::= sclp STAR",
- /* 167 */ "as ::= AS ids",
- /* 168 */ "as ::= ids",
- /* 169 */ "as ::=",
- /* 170 */ "distinct ::= DISTINCT",
- /* 171 */ "distinct ::=",
- /* 172 */ "from ::= FROM tablelist",
- /* 173 */ "from ::= FROM sub",
- /* 174 */ "sub ::= LP union RP",
- /* 175 */ "sub ::= LP union RP ids",
- /* 176 */ "sub ::= sub COMMA LP union RP ids",
- /* 177 */ "tablelist ::= ids cpxName",
- /* 178 */ "tablelist ::= ids cpxName ids",
- /* 179 */ "tablelist ::= tablelist COMMA ids cpxName",
- /* 180 */ "tablelist ::= tablelist COMMA ids cpxName ids",
- /* 181 */ "tmvar ::= VARIABLE",
- /* 182 */ "interval_opt ::= INTERVAL LP tmvar RP",
- /* 183 */ "interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP",
- /* 184 */ "interval_opt ::=",
- /* 185 */ "session_option ::=",
- /* 186 */ "session_option ::= SESSION LP ids cpxName COMMA tmvar RP",
- /* 187 */ "windowstate_option ::=",
- /* 188 */ "windowstate_option ::= STATE_WINDOW LP ids RP",
- /* 189 */ "fill_opt ::=",
- /* 190 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP",
- /* 191 */ "fill_opt ::= FILL LP ID RP",
- /* 192 */ "sliding_opt ::= SLIDING LP tmvar RP",
- /* 193 */ "sliding_opt ::=",
- /* 194 */ "orderby_opt ::=",
- /* 195 */ "orderby_opt ::= ORDER BY sortlist",
- /* 196 */ "sortlist ::= sortlist COMMA item sortorder",
- /* 197 */ "sortlist ::= item sortorder",
- /* 198 */ "item ::= ids cpxName",
- /* 199 */ "sortorder ::= ASC",
- /* 200 */ "sortorder ::= DESC",
- /* 201 */ "sortorder ::=",
- /* 202 */ "groupby_opt ::=",
- /* 203 */ "groupby_opt ::= GROUP BY grouplist",
- /* 204 */ "grouplist ::= grouplist COMMA item",
- /* 205 */ "grouplist ::= item",
- /* 206 */ "having_opt ::=",
- /* 207 */ "having_opt ::= HAVING expr",
- /* 208 */ "limit_opt ::=",
- /* 209 */ "limit_opt ::= LIMIT signed",
- /* 210 */ "limit_opt ::= LIMIT signed OFFSET signed",
- /* 211 */ "limit_opt ::= LIMIT signed COMMA signed",
- /* 212 */ "slimit_opt ::=",
- /* 213 */ "slimit_opt ::= SLIMIT signed",
- /* 214 */ "slimit_opt ::= SLIMIT signed SOFFSET signed",
- /* 215 */ "slimit_opt ::= SLIMIT signed COMMA signed",
- /* 216 */ "where_opt ::=",
- /* 217 */ "where_opt ::= WHERE expr",
- /* 218 */ "expr ::= LP expr RP",
- /* 219 */ "expr ::= ID",
- /* 220 */ "expr ::= ID DOT ID",
- /* 221 */ "expr ::= ID DOT STAR",
- /* 222 */ "expr ::= INTEGER",
- /* 223 */ "expr ::= MINUS INTEGER",
- /* 224 */ "expr ::= PLUS INTEGER",
- /* 225 */ "expr ::= FLOAT",
- /* 226 */ "expr ::= MINUS FLOAT",
- /* 227 */ "expr ::= PLUS FLOAT",
- /* 228 */ "expr ::= STRING",
- /* 229 */ "expr ::= NOW",
- /* 230 */ "expr ::= VARIABLE",
- /* 231 */ "expr ::= PLUS VARIABLE",
- /* 232 */ "expr ::= MINUS VARIABLE",
- /* 233 */ "expr ::= BOOL",
- /* 234 */ "expr ::= NULL",
- /* 235 */ "expr ::= ID LP exprlist RP",
- /* 236 */ "expr ::= ID LP STAR RP",
- /* 237 */ "expr ::= expr IS NULL",
- /* 238 */ "expr ::= expr IS NOT NULL",
- /* 239 */ "expr ::= expr LT expr",
- /* 240 */ "expr ::= expr GT expr",
- /* 241 */ "expr ::= expr LE expr",
- /* 242 */ "expr ::= expr GE expr",
- /* 243 */ "expr ::= expr NE expr",
- /* 244 */ "expr ::= expr EQ expr",
- /* 245 */ "expr ::= expr BETWEEN expr AND expr",
- /* 246 */ "expr ::= expr AND expr",
- /* 247 */ "expr ::= expr OR expr",
- /* 248 */ "expr ::= expr PLUS expr",
- /* 249 */ "expr ::= expr MINUS expr",
- /* 250 */ "expr ::= expr STAR expr",
- /* 251 */ "expr ::= expr SLASH expr",
- /* 252 */ "expr ::= expr REM expr",
- /* 253 */ "expr ::= expr LIKE expr",
- /* 254 */ "expr ::= expr IN LP exprlist RP",
- /* 255 */ "exprlist ::= exprlist COMMA expritem",
- /* 256 */ "exprlist ::= expritem",
- /* 257 */ "expritem ::= expr",
- /* 258 */ "expritem ::=",
- /* 259 */ "cmd ::= RESET QUERY CACHE",
- /* 260 */ "cmd ::= SYNCDB ids REPLICA",
- /* 261 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist",
- /* 262 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids",
- /* 263 */ "cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist",
- /* 264 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist",
- /* 265 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids",
- /* 266 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids",
- /* 267 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem",
- /* 268 */ "cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist",
- /* 269 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist",
- /* 270 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids",
- /* 271 */ "cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist",
- /* 272 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist",
- /* 273 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids",
- /* 274 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids",
- /* 275 */ "cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem",
- /* 276 */ "cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist",
- /* 277 */ "cmd ::= KILL CONNECTION INTEGER",
- /* 278 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER",
- /* 279 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER",
+ /*  78 */ "intitemlist ::= intitemlist COMMA intitem",
+ /*  79 */ "intitemlist ::= intitem",
+ /*  80 */ "intitem ::= INTEGER",
+ /*  81 */ "keep ::= KEEP intitemlist",
+ /*  82 */ "cache ::= CACHE INTEGER",
+ /*  83 */ "replica ::= REPLICA INTEGER",
+ /*  84 */ "quorum ::= QUORUM INTEGER",
+ /*  85 */ "days ::= DAYS INTEGER",
+ /*  86 */ "minrows ::= MINROWS INTEGER",
+ /*  87 */ "maxrows ::= MAXROWS INTEGER",
+ /*  88 */ "blocks ::= BLOCKS INTEGER",
+ /*  89 */ "ctime ::= CTIME INTEGER",
+ /*  90 */ "wal ::= WAL INTEGER",
+ /*  91 */ "fsync ::= FSYNC INTEGER",
+ /*  92 */ "comp ::= COMP INTEGER",
+ /*  93 */ "prec ::= PRECISION STRING",
+ /*  94 */ "update ::= UPDATE INTEGER",
+ /*  95 */ "cachelast ::= CACHELAST INTEGER",
+ /*  96 */ "partitions ::= PARTITIONS INTEGER",
+ /*  97 */ "db_optr ::=",
+ /*  98 */ "db_optr ::= db_optr cache",
+ /*  99 */ "db_optr ::= db_optr replica",
+ /* 100 */ "db_optr ::= db_optr quorum",
+ /* 101 */ "db_optr ::= db_optr days",
+ /* 102 */ "db_optr ::= db_optr minrows",
+ /* 103 */ "db_optr ::= db_optr maxrows",
+ /* 104 */ "db_optr ::= db_optr blocks",
+ /* 105 */ "db_optr ::= db_optr ctime",
+ /* 106 */ "db_optr ::= db_optr wal",
+ /* 107 */ "db_optr ::= db_optr fsync",
+ /* 108 */ "db_optr ::= db_optr comp",
+ /* 109 */ "db_optr ::= db_optr prec",
+ /* 110 */ "db_optr ::= db_optr keep",
+ /* 111 */ "db_optr ::= db_optr update",
+ /* 112 */ "db_optr ::= db_optr cachelast",
+ /* 113 */ "topic_optr ::= db_optr",
+ /* 114 */ "topic_optr ::= topic_optr partitions",
+ /* 115 */ "alter_db_optr ::=",
+ /* 116 */ "alter_db_optr ::= alter_db_optr replica",
+ /* 117 */ "alter_db_optr ::= alter_db_optr quorum",
+ /* 118 */ "alter_db_optr ::= alter_db_optr keep",
+ /* 119 */ "alter_db_optr ::= alter_db_optr blocks",
+ /* 120 */ "alter_db_optr ::= alter_db_optr comp",
+ /* 121 */ "alter_db_optr ::= alter_db_optr wal",
+ /* 122 */ "alter_db_optr ::= alter_db_optr fsync",
+ /* 123 */ "alter_db_optr ::= alter_db_optr update",
+ /* 124 */ "alter_db_optr ::= alter_db_optr cachelast",
+ /* 125 */ "alter_topic_optr ::= alter_db_optr",
+ /* 126 */ "alter_topic_optr ::= alter_topic_optr partitions",
+ /* 127 */ "typename ::= ids",
+ /* 128 */ "typename ::= ids LP signed RP",
+ /* 129 */ "typename ::= ids UNSIGNED",
+ /* 130 */ "signed ::= INTEGER",
+ /* 131 */ "signed ::= PLUS INTEGER",
+ /* 132 */ "signed ::= MINUS INTEGER",
+ /* 133 */ "cmd ::= CREATE TABLE create_table_args",
+ /* 134 */ "cmd ::= CREATE TABLE create_stable_args",
+ /* 135 */ "cmd ::= CREATE STABLE create_stable_args",
+ /* 136 */ "cmd ::= CREATE TABLE create_table_list",
+ /* 137 */ "create_table_list ::= create_from_stable",
+ /* 138 */ "create_table_list ::= create_table_list create_from_stable",
+ /* 139 */ "create_table_args ::= ifnotexists ids cpxName LP columnlist RP",
+ /* 140 */ "create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP",
+ /* 141 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP",
+ /* 142 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP",
+ /* 143 */ "tagNamelist ::= tagNamelist COMMA ids",
+ /* 144 */ "tagNamelist ::= ids",
+ /* 145 */ "create_table_args ::= ifnotexists ids cpxName AS select",
+ /* 146 */ "columnlist ::= columnlist COMMA column",
+ /* 147 */ "columnlist ::= column",
+ /* 148 */ "column ::= ids typename",
+ /* 149 */ "tagitemlist ::= tagitemlist COMMA tagitem",
+ /* 150 */ "tagitemlist ::= tagitem",
+ /* 151 */ "tagitem ::= INTEGER",
+ /* 152 */ "tagitem ::= FLOAT",
+ /* 153 */ "tagitem ::= STRING",
+ /* 154 */ "tagitem ::= BOOL",
+ /* 155 */ "tagitem ::= NULL",
+ /* 156 */ "tagitem ::= MINUS INTEGER",
+ /* 157 */ "tagitem ::= MINUS FLOAT",
+ /* 158 */ "tagitem ::= PLUS INTEGER",
+ /* 159 */ "tagitem ::= PLUS FLOAT",
+ /* 160 */ "select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt",
+ /* 161 */ "select ::= LP select RP",
+ /* 162 */ "union ::= select",
+ /* 163 */ "union ::= union UNION ALL select",
+ /* 164 */ "cmd ::= union",
+ /* 165 */ "select ::= SELECT selcollist",
+ /* 166 */ "sclp ::= selcollist COMMA",
+ /* 167 */ "sclp ::=",
+ /* 168 */ "selcollist ::= sclp distinct expr as",
+ /* 169 */ "selcollist ::= sclp STAR",
+ /* 170 */ "as ::= AS ids",
+ /* 171 */ "as ::= ids",
+ /* 172 */ "as ::=",
+ /* 173 */ "distinct ::= DISTINCT",
+ /* 174 */ "distinct ::=",
+ /* 175 */ "from ::= FROM tablelist",
+ /* 176 */ "from ::= FROM sub",
+ /* 177 */ "sub ::= LP union RP",
+ /* 178 */ "sub ::= LP union RP ids",
+ /* 179 */ "sub ::= sub COMMA LP union RP ids",
+ /* 180 */ "tablelist ::= ids cpxName",
+ /* 181 */ "tablelist ::= ids cpxName ids",
+ /* 182 */ "tablelist ::= tablelist COMMA ids cpxName",
+ /* 183 */ "tablelist ::= tablelist COMMA ids cpxName ids",
+ /* 184 */ "tmvar ::= VARIABLE",
+ /* 185 */ "interval_opt ::= INTERVAL LP tmvar RP",
+ /* 186 */ "interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP",
+ /* 187 */ "interval_opt ::=",
+ /* 188 */ "session_option ::=",
+ /* 189 */ "session_option ::= SESSION LP ids cpxName COMMA tmvar RP",
+ /* 190 */ "windowstate_option ::=",
+ /* 191 */ "windowstate_option ::= STATE_WINDOW LP ids RP",
+ /* 192 */ "fill_opt ::=",
+ /* 193 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP",
+ /* 194 */ "fill_opt ::= FILL LP ID RP",
+ /* 195 */ "sliding_opt ::= SLIDING LP tmvar RP",
+ /* 196 */ "sliding_opt ::=",
+ /* 197 */ "orderby_opt ::=",
+ /* 198 */ "orderby_opt ::= ORDER BY sortlist",
+ /* 199 */ "sortlist ::= sortlist COMMA item sortorder",
+ /* 200 */ "sortlist ::= item sortorder",
+ /* 201 */ "item ::= ids cpxName",
+ /* 202 */ "sortorder ::= ASC",
+ /* 203 */ "sortorder ::= DESC",
+ /* 204 */ "sortorder ::=",
+ /* 205 */ "groupby_opt ::=",
+ /* 206 */ "groupby_opt ::= GROUP BY grouplist",
+ /* 207 */ "grouplist ::= grouplist COMMA item",
+ /* 208 */ "grouplist ::= item",
+ /* 209 */ "having_opt ::=",
+ /* 210 */ "having_opt ::= HAVING expr",
+ /* 211 */ "limit_opt ::=",
+ /* 212 */ "limit_opt ::= LIMIT signed",
+ /* 213 */ "limit_opt ::= LIMIT signed OFFSET signed",
+ /* 214 */ "limit_opt ::= LIMIT signed COMMA signed",
+ /* 215 */ "slimit_opt ::=",
+ /* 216 */ "slimit_opt ::= SLIMIT signed",
+ /* 217 */ "slimit_opt ::= SLIMIT signed SOFFSET signed",
+ /* 218 */ "slimit_opt ::= SLIMIT signed COMMA signed",
+ /* 219 */ "where_opt ::=",
+ /* 220 */ "where_opt ::= WHERE expr",
+ /* 221 */ "expr ::= LP expr RP",
+ /* 222 */ "expr ::= ID",
+ /* 223 */ "expr ::= ID DOT ID",
+ /* 224 */ "expr ::= ID DOT STAR",
+ /* 225 */ "expr ::= INTEGER",
+ /* 226 */ "expr ::= MINUS INTEGER",
+ /* 227 */ "expr ::= PLUS INTEGER",
+ /* 228 */ "expr ::= FLOAT",
+ /* 229 */ "expr ::= MINUS FLOAT",
+ /* 230 */ "expr ::= PLUS FLOAT",
+ /* 231 */ "expr ::= STRING",
+ /* 232 */ "expr ::= NOW",
+ /* 233 */ "expr ::= VARIABLE",
+ /* 234 */ "expr ::= PLUS VARIABLE",
+ /* 235 */ "expr ::= MINUS VARIABLE",
+ /* 236 */ "expr ::= BOOL",
+ /* 237 */ "expr ::= NULL",
+ /* 238 */ "expr ::= ID LP exprlist RP",
+ /* 239 */ "expr ::= ID LP STAR RP",
+ /* 240 */ "expr ::= expr IS NULL",
+ /* 241 */ "expr ::= expr IS NOT NULL",
+ /* 242 */ "expr ::= expr LT expr",
+ /* 243 */ "expr ::= expr GT expr",
+ /* 244 */ "expr ::= expr LE expr",
+ /* 245 */ "expr ::= expr GE expr",
+ /* 246 */ "expr ::= expr NE expr",
+ /* 247 */ "expr ::= expr EQ expr",
+ /* 248 */ "expr ::= expr BETWEEN expr AND expr",
+ /* 249 */ "expr ::= expr AND expr",
+ /* 250 */ "expr ::= expr OR expr",
+ /* 251 */ "expr ::= expr PLUS expr",
+ /* 252 */ "expr ::= expr MINUS expr",
+ /* 253 */ "expr ::= expr STAR expr",
+ /* 254 */ "expr ::= expr SLASH expr",
+ /* 255 */ "expr ::= expr REM expr",
+ /* 256 */ "expr ::= expr LIKE expr",
+ /* 257 */ "expr ::= expr IN LP exprlist RP",
+ /* 258 */ "exprlist ::= exprlist COMMA expritem",
+ /* 259 */ "exprlist ::= expritem",
+ /* 260 */ "expritem ::= expr",
+ /* 261 */ "expritem ::=",
+ /* 262 */ "cmd ::= RESET QUERY CACHE",
+ /* 263 */ "cmd ::= SYNCDB ids REPLICA",
+ /* 264 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist",
+ /* 265 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids",
+ /* 266 */ "cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist",
+ /* 267 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist",
+ /* 268 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids",
+ /* 269 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids",
+ /* 270 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem",
+ /* 271 */ "cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist",
+ /* 272 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist",
+ /* 273 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids",
+ /* 274 */ "cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist",
+ /* 275 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist",
+ /* 276 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids",
+ /* 277 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids",
+ /* 278 */ "cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem",
+ /* 279 */ "cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist",
+ /* 280 */ "cmd ::= KILL CONNECTION INTEGER",
+ /* 281 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER",
+ /* 282 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER",
 };
 #endif /* NDEBUG */
 
@@ -1442,59 +1448,60 @@ static void yy_destructor(
     ** inside the C code.
     */
 /********* Begin destructor definitions ***************************************/
-    case 211: /* keep */
-    case 212: /* tagitemlist */
-    case 234: /* columnlist */
-    case 235: /* tagNamelist */
-    case 245: /* fill_opt */
-    case 247: /* groupby_opt */
-    case 248: /* orderby_opt */
-    case 260: /* sortlist */
-    case 264: /* grouplist */
-{
-taosArrayDestroy((yypminor->yy15));
+    case 211: /* intitemlist */
+    case 213: /* keep */
+    case 235: /* columnlist */
+    case 236: /* tagitemlist */
+    case 237: /* tagNamelist */
+    case 247: /* fill_opt */
+    case 249: /* groupby_opt */
+    case 250: /* orderby_opt */
+    case 262: /* sortlist */
+    case 266: /* grouplist */
+{
+taosArrayDestroy((yypminor->yy93));
 }
       break;
-    case 232: /* create_table_list */
+    case 233: /* create_table_list */
 {
-destroyCreateTableSql((yypminor->yy482));
+destroyCreateTableSql((yypminor->yy532));
 }
       break;
-    case 236: /* select */
+    case 238: /* select */
 {
-destroySqlNode((yypminor->yy134));
+destroySqlNode((yypminor->yy224));
 }
       break;
-    case 239: /* selcollist */
-    case 253: /* sclp */
-    case 265: /* exprlist */
+    case 241: /* selcollist */
+    case 255: /* sclp */
+    case 267: /* exprlist */
 {
-tSqlExprListDestroy((yypminor->yy15));
+tSqlExprListDestroy((yypminor->yy93));
 }
       break;
-    case 240: /* from */
-    case 257: /* tablelist */
-    case 258: /* sub */
+    case 242: /* from */
+    case 259: /* tablelist */
+    case 260: /* sub */
 {
-destroyRelationInfo((yypminor->yy160));
+destroyRelationInfo((yypminor->yy330));
 }
       break;
-    case 241: /* where_opt */
-    case 249: /* having_opt */
-    case 255: /* expr */
-    case 266: /* expritem */
+    case 243: /* where_opt */
+    case 251: /* having_opt */
+    case 257: /* expr */
+    case 268: /* expritem */
 {
-tSqlExprDestroy((yypminor->yy328));
+tSqlExprDestroy((yypminor->yy68));
 }
       break;
-    case 252: /* union */
+    case 254: /* union */
 {
-destroyAllSqlNode((yypminor->yy15));
+destroyAllSqlNode((yypminor->yy93));
 }
       break;
-    case 261: /* sortitem */
+    case 263: /* sortitem */
 {
-tVariantDestroy(&(yypminor->yy380));
+tVariantDestroy(&(yypminor->yy518));
 }
       break;
 /********* End destructor definitions *****************************************/
@@ -1866,208 +1873,211 @@ static const struct {
   {  210,    0 }, /* (75) state ::= */
   {  210,   -2 }, /* (76) state ::= STATE ids */
   {  198,   -9 }, /* (77) acct_optr ::= pps tseries storage streams qtime dbs users conns state */
-  {  211,   -2 }, /* (78) keep ::= KEEP tagitemlist */
-  {  213,   -2 }, /* (79) cache ::= CACHE INTEGER */
-  {  214,   -2 }, /* (80) replica ::= REPLICA INTEGER */
-  {  215,   -2 }, /* (81) quorum ::= QUORUM INTEGER */
-  {  216,   -2 }, /* (82) days ::= DAYS INTEGER */
-  {  217,   -2 }, /* (83) minrows ::= MINROWS INTEGER */
-  {  218,   -2 }, /* (84) maxrows ::= MAXROWS INTEGER */
-  {  219,   -2 }, /* (85) blocks ::= BLOCKS INTEGER */
-  {  220,   -2 }, /* (86) ctime ::= CTIME INTEGER */
-  {  221,   -2 }, /* (87) wal ::= WAL INTEGER */
-  {  222,   -2 }, /* (88) fsync ::= FSYNC INTEGER */
-  {  223,   -2 }, /* (89) comp ::= COMP INTEGER */
-  {  224,   -2 }, /* (90) prec ::= PRECISION STRING */
-  {  225,   -2 }, /* (91) update ::= UPDATE INTEGER */
-  {  226,   -2 }, /* (92) cachelast ::= CACHELAST INTEGER */
-  {  227,   -2 }, /* (93) partitions ::= PARTITIONS INTEGER */
-  {  200,    0 }, /* (94) db_optr ::= */
-  {  200,   -2 }, /* (95) db_optr ::= db_optr cache */
-  {  200,   -2 }, /* (96) db_optr ::= db_optr replica */
-  {  200,   -2 }, /* (97) db_optr ::= db_optr quorum */
-  {  200,   -2 }, /* (98) db_optr ::= db_optr days */
-  {  200,   -2 }, /* (99) db_optr ::= db_optr minrows */
-  {  200,   -2 }, /* (100) db_optr ::= db_optr maxrows */
-  {  200,   -2 }, /* (101) db_optr ::= db_optr blocks */
-  {  200,   -2 }, /* (102) db_optr ::= db_optr ctime */
-  {  200,   -2 }, /* (103) db_optr ::= db_optr wal */
-  {  200,   -2 }, /* (104) db_optr ::= db_optr fsync */
-  {  200,   -2 }, /* (105) db_optr ::= db_optr comp */
-  {  200,   -2 }, /* (106) db_optr ::= db_optr prec */
-  {  200,   -2 }, /* (107) db_optr ::= db_optr keep */
-  {  200,   -2 }, /* (108) db_optr ::= db_optr update */
-  {  200,   -2 }, /* (109) db_optr ::= db_optr cachelast */
-  {  201,   -1 }, /* (110) topic_optr ::= db_optr */
-  {  201,   -2 }, /* (111) topic_optr ::= topic_optr partitions */
-  {  196,    0 }, /* (112) alter_db_optr ::= */
-  {  196,   -2 }, /* (113) alter_db_optr ::= alter_db_optr replica */
-  {  196,   -2 }, /* (114) alter_db_optr ::= alter_db_optr quorum */
-  {  196,   -2 }, /* (115) alter_db_optr ::= alter_db_optr keep */
-  {  196,   -2 }, /* (116) alter_db_optr ::= alter_db_optr blocks */
-  {  196,   -2 }, /* (117) alter_db_optr ::= alter_db_optr comp */
-  {  196,   -2 }, /* (118) alter_db_optr ::= alter_db_optr wal */
-  {  196,   -2 }, /* (119) alter_db_optr ::= alter_db_optr fsync */
-  {  196,   -2 }, /* (120) alter_db_optr ::= alter_db_optr update */
-  {  196,   -2 }, /* (121) alter_db_optr ::= alter_db_optr cachelast */
-  {  197,   -1 }, /* (122) alter_topic_optr ::= alter_db_optr */
-  {  197,   -2 }, /* (123) alter_topic_optr ::= alter_topic_optr partitions */
-  {  228,   -1 }, /* (124) typename ::= ids */
-  {  228,   -4 }, /* (125) typename ::= ids LP signed RP */
-  {  228,   -2 }, /* (126) typename ::= ids UNSIGNED */
-  {  229,   -1 }, /* (127) signed ::= INTEGER */
-  {  229,   -2 }, /* (128) signed ::= PLUS INTEGER */
-  {  229,   -2 }, /* (129) signed ::= MINUS INTEGER */
-  {  191,   -3 }, /* (130) cmd ::= CREATE TABLE create_table_args */
-  {  191,   -3 }, /* (131) cmd ::= CREATE TABLE create_stable_args */
-  {  191,   -3 }, /* (132) cmd ::= CREATE STABLE create_stable_args */
-  {  191,   -3 }, /* (133) cmd ::= CREATE TABLE create_table_list */
-  {  232,   -1 }, /* (134) create_table_list ::= create_from_stable */
-  {  232,   -2 }, /* (135) create_table_list ::= create_table_list create_from_stable */
-  {  230,   -6 }, /* (136) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */
-  {  231,  -10 }, /* (137) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */
-  {  233,  -10 }, /* (138) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */
-  {  233,  -13 }, /* (139) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */
-  {  235,   -3 }, /* (140) tagNamelist ::= tagNamelist COMMA ids */
-  {  235,   -1 }, /* (141) tagNamelist ::= ids */
-  {  230,   -5 }, /* (142) create_table_args ::= ifnotexists ids cpxName AS select */
-  {  234,   -3 }, /* (143) columnlist ::= columnlist COMMA column */
-  {  234,   -1 }, /* (144) columnlist ::= column */
-  {  237,   -2 }, /* (145) column ::= ids typename */
-  {  212,   -3 }, /* (146) tagitemlist ::= tagitemlist COMMA tagitem */
-  {  212,   -1 }, /* (147) tagitemlist ::= tagitem */
-  {  238,   -1 }, /* (148) tagitem ::= INTEGER */
-  {  238,   -1 }, /* (149) tagitem ::= FLOAT */
-  {  238,   -1 }, /* (150) tagitem ::= STRING */
-  {  238,   -1 }, /* (151) tagitem ::= BOOL */
-  {  238,   -1 }, /* (152) tagitem ::= NULL */
-  {  238,   -2 }, /* (153) tagitem ::= MINUS INTEGER */
-  {  238,   -2 }, /* (154) tagitem ::= MINUS FLOAT */
-  {  238,   -2 }, /* (155) tagitem ::= PLUS INTEGER */
-  {  238,   -2 }, /* (156) tagitem ::= PLUS FLOAT */
-  {  236,  -14 }, /* (157) select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */
-  {  236,   -3 }, /* (158) select ::= LP select RP */
-  {  252,   -1 }, /* (159) union ::= select */
-  {  252,   -4 }, /* (160) union ::= union UNION ALL select */
-  {  191,   -1 }, /* (161) cmd ::= union */
-  {  236,   -2 }, /* (162) select ::= SELECT selcollist */
-  {  253,   -2 }, /* (163) sclp ::= selcollist COMMA */
-  {  253,    0 }, /* (164) sclp ::= */
-  {  239,   -4 }, /* (165) selcollist ::= sclp distinct expr as */
-  {  239,   -2 }, /* (166) selcollist ::= sclp STAR */
-  {  256,   -2 }, /* (167) as ::= AS ids */
-  {  256,   -1 }, /* (168) as ::= ids */
-  {  256,    0 }, /* (169) as ::= */
-  {  254,   -1 }, /* (170) distinct ::= DISTINCT */
-  {  254,    0 }, /* (171) distinct ::= */
-  {  240,   -2 }, /* (172) from ::= FROM tablelist */
-  {  240,   -2 }, /* (173) from ::= FROM sub */
-  {  258,   -3 }, /* (174) sub ::= LP union RP */
-  {  258,   -4 }, /* (175) sub ::= LP union RP ids */
-  {  258,   -6 }, /* (176) sub ::= sub COMMA LP union RP ids */
-  {  257,   -2 }, /* (177) tablelist ::= ids cpxName */
-  {  257,   -3 }, /* (178) tablelist ::= ids cpxName ids */
-  {  257,   -4 }, /* (179) tablelist ::= tablelist COMMA ids cpxName */
-  {  257,   -5 }, /* (180) tablelist ::= tablelist COMMA ids cpxName ids */
-  {  259,   -1 }, /* (181) tmvar ::= VARIABLE */
-  {  242,   -4 }, /* (182) interval_opt ::= INTERVAL LP tmvar RP */
-  {  242,   -6 }, /* (183) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */
-  {  242,    0 }, /* (184) interval_opt ::= */
-  {  243,    0 }, /* (185) session_option ::= */
-  {  243,   -7 }, /* (186) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */
-  {  244,    0 }, /* (187) windowstate_option ::= */
-  {  244,   -4 }, /* (188) windowstate_option ::= STATE_WINDOW LP ids RP */
-  {  245,    0 }, /* (189) fill_opt ::= */
-  {  245,   -6 }, /* (190) fill_opt ::= FILL LP ID COMMA tagitemlist RP */
-  {  245,   -4 }, /* (191) fill_opt ::= FILL LP ID RP */
-  {  246,   -4 }, /* (192) sliding_opt ::= SLIDING LP tmvar RP */
-  {  246,    0 }, /* (193) sliding_opt ::= */
-  {  248,    0 }, /* (194) orderby_opt ::= */
-  {  248,   -3 }, /* (195) orderby_opt ::= ORDER BY sortlist */
-  {  260,   -4 }, /* (196) sortlist ::= sortlist COMMA item sortorder */
-  {  260,   -2 }, /* (197) sortlist ::= item sortorder */
-  {  262,   -2 }, /* (198) item ::= ids cpxName */
-  {  263,   -1 }, /* (199) sortorder ::= ASC */
-  {  263,   -1 }, /* (200) sortorder ::= DESC */
-  {  263,    0 }, /* (201) sortorder ::= */
-  {  247,    0 }, /* (202) groupby_opt ::= */
-  {  247,   -3 }, /* (203) groupby_opt ::= GROUP BY grouplist */
-  {  264,   -3 }, /* (204) grouplist ::= grouplist COMMA item */
-  {  264,   -1 }, /* (205) grouplist ::= item */
-  {  249,    0 }, /* (206) having_opt ::= */
-  {  249,   -2 }, /* (207) having_opt ::= HAVING expr */
-  {  251,    0 }, /* (208) limit_opt ::= */
-  {  251,   -2 }, /* (209) limit_opt ::= LIMIT signed */
-  {  251,   -4 }, /* (210) limit_opt ::= LIMIT signed OFFSET signed */
-  {  251,   -4 }, /* (211) limit_opt ::= LIMIT signed COMMA signed */
-  {  250,    0 }, /* (212) slimit_opt ::= */
-  {  250,   -2 }, /* (213) slimit_opt ::= SLIMIT signed */
-  {  250,   -4 }, /* (214) slimit_opt ::= SLIMIT signed SOFFSET signed */
-  {  250,   -4 }, /* (215) slimit_opt ::= SLIMIT signed COMMA signed */
-  {  241,    0 }, /* (216) where_opt ::= */
-  {  241,   -2 }, /* (217) where_opt ::= WHERE expr */
-  {  255,   -3 }, /* (218) expr ::= LP expr RP */
-  {  255,   -1 }, /* (219) expr ::= ID */
-  {  255,   -3 }, /* (220) expr ::= ID DOT ID */
-  {  255,   -3 }, /* (221) expr ::= ID DOT STAR */
-  {  255,   -1 }, /* (222) expr ::= INTEGER */
-  {  255,   -2 }, /* (223) expr ::= MINUS INTEGER */
-  {  255,   -2 }, /* (224) expr ::= PLUS INTEGER */
-  {  255,   -1 }, /* (225) expr ::= FLOAT */
-  {  255,   -2 }, /* (226) expr ::= MINUS FLOAT */
-  {  255,   -2 }, /* (227) expr ::= PLUS FLOAT */
-  {  255,   -1 }, /* (228) expr ::= STRING */
-  {  255,   -1 }, /* (229) expr ::= NOW */
-  {  255,   -1 }, /* (230) expr ::= VARIABLE */
-  {  255,   -2 }, /* (231) expr ::= PLUS VARIABLE */
-  {  255,   -2 }, /* (232) expr ::= MINUS VARIABLE */
-  {  255,   -1 }, /* (233) expr ::= BOOL */
-  {  255,   -1 }, /* (234) expr ::= NULL */
-  {  255,   -4 }, /* (235) expr ::= ID LP exprlist RP */
-  {  255,   -4 }, /* (236) expr ::= ID LP STAR RP */
-  {  255,   -3 }, /* (237) expr ::= expr IS NULL */
-  {  255,   -4 }, /* (238) expr ::= expr IS NOT NULL */
-  {  255,   -3 }, /* (239) expr ::= expr LT expr */
-  {  255,   -3 }, /* (240) expr ::= expr GT expr */
-  {  255,   -3 }, /* (241) expr ::= expr LE expr */
-  {  255,   -3 }, /* (242) expr ::= expr GE expr */
-  {  255,   -3 }, /* (243) expr ::= expr NE expr */
-  {  255,   -3 }, /* (244) expr ::= expr EQ expr */
-  {  255,   -5 }, /* (245) expr ::= expr BETWEEN expr AND expr */
-  {  255,   -3 }, /* (246) expr ::= expr AND expr */
-  {  255,   -3 }, /* (247) expr ::= expr OR expr */
-  {  255,   -3 }, /* (248) expr ::= expr PLUS expr */
-  {  255,   -3 }, /* (249) expr ::= expr MINUS expr */
-  {  255,   -3 }, /* (250) expr ::= expr STAR expr */
-  {  255,   -3 }, /* (251) expr ::= expr SLASH expr */
-  {  255,   -3 }, /* (252) expr ::= expr REM expr */
-  {  255,   -3 }, /* (253) expr ::= expr LIKE expr */
-  {  255,   -5 }, /* (254) expr ::= expr IN LP exprlist RP */
-  {  265,   -3 }, /* (255) exprlist ::= exprlist COMMA expritem */
-  {  265,   -1 }, /* (256) exprlist ::= expritem */
-  {  266,   -1 }, /* (257) expritem ::= expr */
-  {  266,    0 }, /* (258) expritem ::= */
-  {  191,   -3 }, /* (259) cmd ::= RESET QUERY CACHE */
-  {  191,   -3 }, /* (260) cmd ::= SYNCDB ids REPLICA */
-  {  191,   -7 }, /* (261) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
-  {  191,   -7 }, /* (262) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
-  {  191,   -7 }, /* (263) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */
-  {  191,   -7 }, /* (264) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
-  {  191,   -7 }, /* (265) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
-  {  191,   -8 }, /* (266) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
-  {  191,   -9 }, /* (267) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
-  {  191,   -7 }, /* (268) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */
-  {  191,   -7 }, /* (269) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
-  {  191,   -7 }, /* (270) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
-  {  191,   -7 }, /* (271) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */
-  {  191,   -7 }, /* (272) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
-  {  191,   -7 }, /* (273) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
-  {  191,   -8 }, /* (274) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
-  {  191,   -9 }, /* (275) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */
-  {  191,   -7 }, /* (276) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */
-  {  191,   -3 }, /* (277) cmd ::= KILL CONNECTION INTEGER */
-  {  191,   -5 }, /* (278) cmd ::= KILL STREAM INTEGER COLON INTEGER */
-  {  191,   -5 }, /* (279) cmd ::= KILL QUERY INTEGER COLON INTEGER */
+  {  211,   -3 }, /* (78) intitemlist ::= intitemlist COMMA intitem */
+  {  211,   -1 }, /* (79) intitemlist ::= intitem */
+  {  212,   -1 }, /* (80) intitem ::= INTEGER */
+  {  213,   -2 }, /* (81) keep ::= KEEP intitemlist */
+  {  214,   -2 }, /* (82) cache ::= CACHE INTEGER */
+  {  215,   -2 }, /* (83) replica ::= REPLICA INTEGER */
+  {  216,   -2 }, /* (84) quorum ::= QUORUM INTEGER */
+  {  217,   -2 }, /* (85) days ::= DAYS INTEGER */
+  {  218,   -2 }, /* (86) minrows ::= MINROWS INTEGER */
+  {  219,   -2 }, /* (87) maxrows ::= MAXROWS INTEGER */
+  {  220,   -2 }, /* (88) blocks ::= BLOCKS INTEGER */
+  {  221,   -2 }, /* (89) ctime ::= CTIME INTEGER */
+  {  222,   -2 }, /* (90) wal ::= WAL INTEGER */
+  {  223,   -2 }, /* (91) fsync ::= FSYNC INTEGER */
+  {  224,   -2 }, /* (92) comp ::= COMP INTEGER */
+  {  225,   -2 }, /* (93) prec ::= PRECISION STRING */
+  {  226,   -2 }, /* (94) update ::= UPDATE INTEGER */
+  {  227,   -2 }, /* (95) cachelast ::= CACHELAST INTEGER */
+  {  228,   -2 }, /* (96) partitions ::= PARTITIONS INTEGER */
+  {  200,    0 }, /* (97) db_optr ::= */
+  {  200,   -2 }, /* (98) db_optr ::= db_optr cache */
+  {  200,   -2 }, /* (99) db_optr ::= db_optr replica */
+  {  200,   -2 }, /* (100) db_optr ::= db_optr quorum */
+  {  200,   -2 }, /* (101) db_optr ::= db_optr days */
+  {  200,   -2 }, /* (102) db_optr ::= db_optr minrows */
+  {  200,   -2 }, /* (103) db_optr ::= db_optr maxrows */
+  {  200,   -2 }, /* (104) db_optr ::= db_optr blocks */
+  {  200,   -2 }, /* (105) db_optr ::= db_optr ctime */
+  {  200,   -2 }, /* (106) db_optr ::= db_optr wal */
+  {  200,   -2 }, /* (107) db_optr ::= db_optr fsync */
+  {  200,   -2 }, /* (108) db_optr ::= db_optr comp */
+  {  200,   -2 }, /* (109) db_optr ::= db_optr prec */
+  {  200,   -2 }, /* (110) db_optr ::= db_optr keep */
+  {  200,   -2 }, /* (111) db_optr ::= db_optr update */
+  {  200,   -2 }, /* (112) db_optr ::= db_optr cachelast */
+  {  201,   -1 }, /* (113) topic_optr ::= db_optr */
+  {  201,   -2 }, /* (114) topic_optr ::= topic_optr partitions */
+  {  196,    0 }, /* (115) alter_db_optr ::= */
+  {  196,   -2 }, /* (116) alter_db_optr ::= alter_db_optr replica */
+  {  196,   -2 }, /* (117) alter_db_optr ::= alter_db_optr quorum */
+  {  196,   -2 }, /* (118) alter_db_optr ::= alter_db_optr keep */
+  {  196,   -2 }, /* (119) alter_db_optr ::= alter_db_optr blocks */
+  {  196,   -2 }, /* (120) alter_db_optr ::= alter_db_optr comp */
+  {  196,   -2 }, /* (121) alter_db_optr ::= alter_db_optr wal */
+  {  196,   -2 }, /* (122) alter_db_optr ::= alter_db_optr fsync */
+  {  196,   -2 }, /* (123) alter_db_optr ::= alter_db_optr update */
+  {  196,   -2 }, /* (124) alter_db_optr ::= alter_db_optr cachelast */
+  {  197,   -1 }, /* (125) alter_topic_optr ::= alter_db_optr */
+  {  197,   -2 }, /* (126) alter_topic_optr ::= alter_topic_optr partitions */
+  {  229,   -1 }, /* (127) typename ::= ids */
+  {  229,   -4 }, /* (128) typename ::= ids LP signed RP */
+  {  229,   -2 }, /* (129) typename ::= ids UNSIGNED */
+  {  230,   -1 }, /* (130) signed ::= INTEGER */
+  {  230,   -2 }, /* (131) signed ::= PLUS INTEGER */
+  {  230,   -2 }, /* (132) signed ::= MINUS INTEGER */
+  {  191,   -3 }, /* (133) cmd ::= CREATE TABLE create_table_args */
+  {  191,   -3 }, /* (134) cmd ::= CREATE TABLE create_stable_args */
+  {  191,   -3 }, /* (135) cmd ::= CREATE STABLE create_stable_args */
+  {  191,   -3 }, /* (136) cmd ::= CREATE TABLE create_table_list */
+  {  233,   -1 }, /* (137) create_table_list ::= create_from_stable */
+  {  233,   -2 }, /* (138) create_table_list ::= create_table_list create_from_stable */
+  {  231,   -6 }, /* (139) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */
+  {  232,  -10 }, /* (140) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */
+  {  234,  -10 }, /* (141) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */
+  {  234,  -13 }, /* (142) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */
+  {  237,   -3 }, /* (143) tagNamelist ::= tagNamelist COMMA ids */
+  {  237,   -1 }, /* (144) tagNamelist ::= ids */
+  {  231,   -5 }, /* (145) create_table_args ::= ifnotexists ids cpxName AS select */
+  {  235,   -3 }, /* (146) columnlist ::= columnlist COMMA column */
+  {  235,   -1 }, /* (147) columnlist ::= column */
+  {  239,   -2 }, /* (148) column ::= ids typename */
+  {  236,   -3 }, /* (149) tagitemlist ::= tagitemlist COMMA tagitem */
+  {  236,   -1 }, /* (150) tagitemlist ::= tagitem */
+  {  240,   -1 }, /* (151) tagitem ::= INTEGER */
+  {  240,   -1 }, /* (152) tagitem ::= FLOAT */
+  {  240,   -1 }, /* (153) tagitem ::= STRING */
+  {  240,   -1 }, /* (154) tagitem ::= BOOL */
+  {  240,   -1 }, /* (155) tagitem ::= NULL */
+  {  240,   -2 }, /* (156) tagitem ::= MINUS INTEGER */
+  {  240,   -2 }, /* (157) tagitem ::= MINUS FLOAT */
+  {  240,   -2 }, /* (158) tagitem ::= PLUS INTEGER */
+  {  240,   -2 }, /* (159) tagitem ::= PLUS FLOAT */
+  {  238,  -14 }, /* (160) select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */
+  {  238,   -3 }, /* (161) select ::= LP select RP */
+  {  254,   -1 }, /* (162) union ::= select */
+  {  254,   -4 }, /* (163) union ::= union UNION ALL select */
+  {  191,   -1 }, /* (164) cmd ::= union */
+  {  238,   -2 }, /* (165) select ::= SELECT selcollist */
+  {  255,   -2 }, /* (166) sclp ::= selcollist COMMA */
+  {  255,    0 }, /* (167) sclp ::= */
+  {  241,   -4 }, /* (168) selcollist ::= sclp distinct expr as */
+  {  241,   -2 }, /* (169) selcollist ::= sclp STAR */
+  {  258,   -2 }, /* (170) as ::= AS ids */
+  {  258,   -1 }, /* (171) as ::= ids */
+  {  258,    0 }, /* (172) as ::= */
+  {  256,   -1 }, /* (173) distinct ::= DISTINCT */
+  {  256,    0 }, /* (174) distinct ::= */
+  {  242,   -2 }, /* (175) from ::= FROM tablelist */
+  {  242,   -2 }, /* (176) from ::= FROM sub */
+  {  260,   -3 }, /* (177) sub ::= LP union RP */
+  {  260,   -4 }, /* (178) sub ::= LP union RP ids */
+  {  260,   -6 }, /* (179) sub ::= sub COMMA LP union RP ids */
+  {  259,   -2 }, /* (180) tablelist ::= ids cpxName */
+  {  259,   -3 }, /* (181) tablelist ::= ids cpxName ids */
+  {  259,   -4 }, /* (182) tablelist ::= tablelist COMMA ids cpxName */
+  {  259,   -5 }, /* (183) tablelist ::= tablelist COMMA ids cpxName ids */
+  {  261,   -1 }, /* (184) tmvar ::= VARIABLE */
+  {  244,   -4 }, /* (185) interval_opt ::= INTERVAL LP tmvar RP */
+  {  244,   -6 }, /* (186) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */
+  {  244,    0 }, /* (187) interval_opt ::= */
+  {  245,    0 }, /* (188) session_option ::= */
+  {  245,   -7 }, /* (189) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */
+  {  246,    0 }, /* (190) windowstate_option ::= */
+  {  246,   -4 }, /* (191) windowstate_option ::= STATE_WINDOW LP ids RP */
+  {  247,    0 }, /* (192) fill_opt ::= */
+  {  247,   -6 }, /* (193) fill_opt ::= FILL LP ID COMMA tagitemlist RP */
+  {  247,   -4 }, /* (194) fill_opt ::= FILL LP ID RP */
+  {  248,   -4 }, /* (195) sliding_opt ::= SLIDING LP tmvar RP */
+  {  248,    0 }, /* (196) sliding_opt ::= */
+  {  250,    0 }, /* (197) orderby_opt ::= */
+  {  250,   -3 }, /* (198) orderby_opt ::= ORDER BY sortlist */
+  {  262,   -4 }, /* (199) sortlist ::= sortlist COMMA item sortorder */
+  {  262,   -2 }, /* (200) sortlist ::= item sortorder */
+  {  264,   -2 }, /* (201) item ::= ids cpxName */
+  {  265,   -1 }, /* (202) sortorder ::= ASC */
+  {  265,   -1 }, /* (203) sortorder ::= DESC */
+  {  265,    0 }, /* (204) sortorder ::= */
+  {  249,    0 }, /* (205) groupby_opt ::= */
+  {  249,   -3 }, /* (206) groupby_opt ::= GROUP BY grouplist */
+  {  266,   -3 }, /* (207) grouplist ::= grouplist COMMA item */
+  {  266,   -1 }, /* (208) grouplist ::= item */
+  {  251,    0 }, /* (209) having_opt ::= */
+  {  251,   -2 }, /* (210) having_opt ::= HAVING expr */
+  {  253,    0 }, /* (211) limit_opt ::= */
+  {  253,   -2 }, /* (212) limit_opt ::= LIMIT signed */
+  {  253,   -4 }, /* (213) limit_opt ::= LIMIT signed OFFSET signed */
+  {  253,   -4 }, /* (214) limit_opt ::= LIMIT signed COMMA signed */
+  {  252,    0 }, /* (215) slimit_opt ::= */
+  {  252,   -2 }, /* (216) slimit_opt ::= SLIMIT signed */
+  {  252,   -4 }, /* (217) slimit_opt ::= SLIMIT signed SOFFSET signed */
+  {  252,   -4 }, /* (218) slimit_opt ::= SLIMIT signed COMMA signed */
+  {  243,    0 }, /* (219) where_opt ::= */
+  {  243,   -2 }, /* (220) where_opt ::= WHERE expr */
+  {  257,   -3 }, /* (221) expr ::= LP expr RP */
+  {  257,   -1 }, /* (222) expr ::= ID */
+  {  257,   -3 }, /* (223) expr ::= ID DOT ID */
+  {  257,   -3 }, /* (224) expr ::= ID DOT STAR */
+  {  257,   -1 }, /* (225) expr ::= INTEGER */
+  {  257,   -2 }, /* (226) expr ::= MINUS INTEGER */
+  {  257,   -2 }, /* (227) expr ::= PLUS INTEGER */
+  {  257,   -1 }, /* (228) expr ::= FLOAT */
+  {  257,   -2 }, /* (229) expr ::= MINUS FLOAT */
+  {  257,   -2 }, /* (230) expr ::= PLUS FLOAT */
+  {  257,   -1 }, /* (231) expr ::= STRING */
+  {  257,   -1 }, /* (232) expr ::= NOW */
+  {  257,   -1 }, /* (233) expr ::= VARIABLE */
+  {  257,   -2 }, /* (234) expr ::= PLUS VARIABLE */
+  {  257,   -2 }, /* (235) expr ::= MINUS VARIABLE */
+  {  257,   -1 }, /* (236) expr ::= BOOL */
+  {  257,   -1 }, /* (237) expr ::= NULL */
+  {  257,   -4 }, /* (238) expr ::= ID LP exprlist RP */
+  {  257,   -4 }, /* (239) expr ::= ID LP STAR RP */
+  {  257,   -3 }, /* (240) expr ::= expr IS NULL */
+  {  257,   -4 }, /* (241) expr ::= expr IS NOT NULL */
+  {  257,   -3 }, /* (242) expr ::= expr LT expr */
+  {  257,   -3 }, /* (243) expr ::= expr GT expr */
+  {  257,   -3 }, /* (244) expr ::= expr LE expr */
+  {  257,   -3 }, /* (245) expr ::= expr GE expr */
+  {  257,   -3 }, /* (246) expr ::= expr NE expr */
+  {  257,   -3 }, /* (247) expr ::= expr EQ expr */
+  {  257,   -5 }, /* (248) expr ::= expr BETWEEN expr AND expr */
+  {  257,   -3 }, /* (249) expr ::= expr AND expr */
+  {  257,   -3 }, /* (250) expr ::= expr OR expr */
+  {  257,   -3 }, /* (251) expr ::= expr PLUS expr */
+  {  257,   -3 }, /* (252) expr ::= expr MINUS expr */
+  {  257,   -3 }, /* (253) expr ::= expr STAR expr */
+  {  257,   -3 }, /* (254) expr ::= expr SLASH expr */
+  {  257,   -3 }, /* (255) expr ::= expr REM expr */
+  {  257,   -3 }, /* (256) expr ::= expr LIKE expr */
+  {  257,   -5 }, /* (257) expr ::= expr IN LP exprlist RP */
+  {  267,   -3 }, /* (258) exprlist ::= exprlist COMMA expritem */
+  {  267,   -1 }, /* (259) exprlist ::= expritem */
+  {  268,   -1 }, /* (260) expritem ::= expr */
+  {  268,    0 }, /* (261) expritem ::= */
+  {  191,   -3 }, /* (262) cmd ::= RESET QUERY CACHE */
+  {  191,   -3 }, /* (263) cmd ::= SYNCDB ids REPLICA */
+  {  191,   -7 }, /* (264) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
+  {  191,   -7 }, /* (265) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
+  {  191,   -7 }, /* (266) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */
+  {  191,   -7 }, /* (267) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
+  {  191,   -7 }, /* (268) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
+  {  191,   -8 }, /* (269) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
+  {  191,   -9 }, /* (270) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
+  {  191,   -7 }, /* (271) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */
+  {  191,   -7 }, /* (272) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
+  {  191,   -7 }, /* (273) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
+  {  191,   -7 }, /* (274) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */
+  {  191,   -7 }, /* (275) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
+  {  191,   -7 }, /* (276) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
+  {  191,   -8 }, /* (277) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
+  {  191,   -9 }, /* (278) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */
+  {  191,   -7 }, /* (279) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */
+  {  191,   -3 }, /* (280) cmd ::= KILL CONNECTION INTEGER */
+  {  191,   -5 }, /* (281) cmd ::= KILL STREAM INTEGER COLON INTEGER */
+  {  191,   -5 }, /* (282) cmd ::= KILL QUERY INTEGER COLON INTEGER */
 };
 
 static void yy_accept(yyParser*);  /* Forward Declaration */
@@ -2148,9 +2158,9 @@ static void yy_reduce(
 /********** Begin reduce actions **********************************************/
         YYMINORTYPE yylhsminor;
       case 0: /* program ::= cmd */
-      case 130: /* cmd ::= CREATE TABLE create_table_args */ yytestcase(yyruleno==130);
-      case 131: /* cmd ::= CREATE TABLE create_stable_args */ yytestcase(yyruleno==131);
-      case 132: /* cmd ::= CREATE STABLE create_stable_args */ yytestcase(yyruleno==132);
+      case 133: /* cmd ::= CREATE TABLE create_table_args */ yytestcase(yyruleno==133);
+      case 134: /* cmd ::= CREATE TABLE create_stable_args */ yytestcase(yyruleno==134);
+      case 135: /* cmd ::= CREATE STABLE create_stable_args */ yytestcase(yyruleno==135);
 {}
         break;
       case 1: /* cmd ::= SHOW DATABASES */
@@ -2320,13 +2330,13 @@ static void yy_reduce(
         break;
       case 44: /* cmd ::= ALTER DATABASE ids alter_db_optr */
       case 45: /* cmd ::= ALTER TOPIC ids alter_topic_optr */ yytestcase(yyruleno==45);
-{ SStrToken t = {0};  setCreateDbInfo(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy454, &t);}
+{ SStrToken t = {0};  setCreateDbInfo(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy372, &t);}
         break;
       case 46: /* cmd ::= ALTER ACCOUNT ids acct_optr */
-{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy397);}
+{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy77);}
         break;
       case 47: /* cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */
-{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy397);}
+{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy77);}
         break;
       case 48: /* ids ::= ID */
       case 49: /* ids ::= STRING */ yytestcase(yyruleno==49);
@@ -2338,7 +2348,7 @@ static void yy_reduce(
         break;
       case 51: /* ifexists ::= */
       case 53: /* ifnotexists ::= */ yytestcase(yyruleno==53);
-      case 171: /* distinct ::= */ yytestcase(yyruleno==171);
+      case 174: /* distinct ::= */ yytestcase(yyruleno==174);
 { yymsp[1].minor.yy0.n = 0;}
         break;
       case 52: /* ifnotexists ::= IF NOT EXISTS */
@@ -2348,11 +2358,11 @@ static void yy_reduce(
 { setDCLSqlElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &yymsp[0].minor.yy0);}
         break;
       case 55: /* cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */
-{ setCreateAcctSql(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy397);}
+{ setCreateAcctSql(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy77);}
         break;
       case 56: /* cmd ::= CREATE DATABASE ifnotexists ids db_optr */
       case 57: /* cmd ::= CREATE TOPIC ifnotexists ids topic_optr */ yytestcase(yyruleno==57);
-{ setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy454, &yymsp[-2].minor.yy0);}
+{ setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy372, &yymsp[-2].minor.yy0);}
         break;
       case 58: /* cmd ::= CREATE USER ids PASS ids */
 { setCreateUserSql(pInfo, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);}
@@ -2381,682 +2391,685 @@ static void yy_reduce(
         break;
       case 77: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */
 {
-    yylhsminor.yy397.maxUsers   = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1;
-    yylhsminor.yy397.maxDbs     = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1;
-    yylhsminor.yy397.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1;
-    yylhsminor.yy397.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1;
-    yylhsminor.yy397.maxPointsPerSecond     = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1;
-    yylhsminor.yy397.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1;
-    yylhsminor.yy397.maxQueryTime   = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1;
-    yylhsminor.yy397.maxConnections   = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1;
-    yylhsminor.yy397.stat    = yymsp[0].minor.yy0;
-}
-  yymsp[-8].minor.yy397 = yylhsminor.yy397;
-        break;
-      case 78: /* keep ::= KEEP tagitemlist */
-{ yymsp[-1].minor.yy15 = yymsp[0].minor.yy15; }
-        break;
-      case 79: /* cache ::= CACHE INTEGER */
-      case 80: /* replica ::= REPLICA INTEGER */ yytestcase(yyruleno==80);
-      case 81: /* quorum ::= QUORUM INTEGER */ yytestcase(yyruleno==81);
-      case 82: /* days ::= DAYS INTEGER */ yytestcase(yyruleno==82);
-      case 83: /* minrows ::= MINROWS INTEGER */ yytestcase(yyruleno==83);
-      case 84: /* maxrows ::= MAXROWS INTEGER */ yytestcase(yyruleno==84);
-      case 85: /* blocks ::= BLOCKS INTEGER */ yytestcase(yyruleno==85);
-      case 86: /* ctime ::= CTIME INTEGER */ yytestcase(yyruleno==86);
-      case 87: /* wal ::= WAL INTEGER */ yytestcase(yyruleno==87);
-      case 88: /* fsync ::= FSYNC INTEGER */ yytestcase(yyruleno==88);
-      case 89: /* comp ::= COMP INTEGER */ yytestcase(yyruleno==89);
-      case 90: /* prec ::= PRECISION STRING */ yytestcase(yyruleno==90);
-      case 91: /* update ::= UPDATE INTEGER */ yytestcase(yyruleno==91);
-      case 92: /* cachelast ::= CACHELAST INTEGER */ yytestcase(yyruleno==92);
-      case 93: /* partitions ::= PARTITIONS INTEGER */ yytestcase(yyruleno==93);
+    yylhsminor.yy77.maxUsers   = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1;
+    yylhsminor.yy77.maxDbs     = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1;
+    yylhsminor.yy77.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1;
+    yylhsminor.yy77.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1;
+    yylhsminor.yy77.maxPointsPerSecond     = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1;
+    yylhsminor.yy77.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1;
+    yylhsminor.yy77.maxQueryTime   = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1;
+    yylhsminor.yy77.maxConnections   = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1;
+    yylhsminor.yy77.stat    = yymsp[0].minor.yy0;
+}
+  yymsp[-8].minor.yy77 = yylhsminor.yy77;
+        break;
+      case 78: /* intitemlist ::= intitemlist COMMA intitem */
+      case 149: /* tagitemlist ::= tagitemlist COMMA tagitem */ yytestcase(yyruleno==149);
+{ yylhsminor.yy93 = tVariantListAppend(yymsp[-2].minor.yy93, &yymsp[0].minor.yy518, -1);    }
+  yymsp[-2].minor.yy93 = yylhsminor.yy93;
+        break;
+      case 79: /* intitemlist ::= intitem */
+      case 150: /* tagitemlist ::= tagitem */ yytestcase(yyruleno==150);
+{ yylhsminor.yy93 = tVariantListAppend(NULL, &yymsp[0].minor.yy518, -1); }
+  yymsp[0].minor.yy93 = yylhsminor.yy93;
+        break;
+      case 80: /* intitem ::= INTEGER */
+      case 151: /* tagitem ::= INTEGER */ yytestcase(yyruleno==151);
+      case 152: /* tagitem ::= FLOAT */ yytestcase(yyruleno==152);
+      case 153: /* tagitem ::= STRING */ yytestcase(yyruleno==153);
+      case 154: /* tagitem ::= BOOL */ yytestcase(yyruleno==154);
+{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy518, &yymsp[0].minor.yy0); }
+  yymsp[0].minor.yy518 = yylhsminor.yy518;
+        break;
+      case 81: /* keep ::= KEEP intitemlist */
+{ yymsp[-1].minor.yy93 = yymsp[0].minor.yy93; }
+        break;
+      case 82: /* cache ::= CACHE INTEGER */
+      case 83: /* replica ::= REPLICA INTEGER */ yytestcase(yyruleno==83);
+      case 84: /* quorum ::= QUORUM INTEGER */ yytestcase(yyruleno==84);
+      case 85: /* days ::= DAYS INTEGER */ yytestcase(yyruleno==85);
+      case 86: /* minrows ::= MINROWS INTEGER */ yytestcase(yyruleno==86);
+      case 87: /* maxrows ::= MAXROWS INTEGER */ yytestcase(yyruleno==87);
+      case 88: /* blocks ::= BLOCKS INTEGER */ yytestcase(yyruleno==88);
+      case 89: /* ctime ::= CTIME INTEGER */ yytestcase(yyruleno==89);
+      case 90: /* wal ::= WAL INTEGER */ yytestcase(yyruleno==90);
+      case 91: /* fsync ::= FSYNC INTEGER */ yytestcase(yyruleno==91);
+      case 92: /* comp ::= COMP INTEGER */ yytestcase(yyruleno==92);
+      case 93: /* prec ::= PRECISION STRING */ yytestcase(yyruleno==93);
+      case 94: /* update ::= UPDATE INTEGER */ yytestcase(yyruleno==94);
+      case 95: /* cachelast ::= CACHELAST INTEGER */ yytestcase(yyruleno==95);
+      case 96: /* partitions ::= PARTITIONS INTEGER */ yytestcase(yyruleno==96);
 { yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; }
         break;
-      case 94: /* db_optr ::= */
-{setDefaultCreateDbOption(&yymsp[1].minor.yy454); yymsp[1].minor.yy454.dbType = TSDB_DB_TYPE_DEFAULT;}
-        break;
-      case 95: /* db_optr ::= db_optr cache */
-{ yylhsminor.yy454 = yymsp[-1].minor.yy454; yylhsminor.yy454.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-  yymsp[-1].minor.yy454 = yylhsminor.yy454;
-        break;
-      case 96: /* db_optr ::= db_optr replica */
-      case 113: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==113);
-{ yylhsminor.yy454 = yymsp[-1].minor.yy454; yylhsminor.yy454.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-  yymsp[-1].minor.yy454 = yylhsminor.yy454;
-        break;
-      case 97: /* db_optr ::= db_optr quorum */
-      case 114: /* alter_db_optr ::= alter_db_optr quorum */ yytestcase(yyruleno==114);
-{ yylhsminor.yy454 = yymsp[-1].minor.yy454; yylhsminor.yy454.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-  yymsp[-1].minor.yy454 = yylhsminor.yy454;
-        break;
-      case 98: /* db_optr ::= db_optr days */
-{ yylhsminor.yy454 = yymsp[-1].minor.yy454; yylhsminor.yy454.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-  yymsp[-1].minor.yy454 = yylhsminor.yy454;
-        break;
-      case 99: /* db_optr ::= db_optr minrows */
-{ yylhsminor.yy454 = yymsp[-1].minor.yy454; yylhsminor.yy454.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); }
-  yymsp[-1].minor.yy454 = yylhsminor.yy454;
-        break;
-      case 100: /* db_optr ::= db_optr maxrows */
-{ yylhsminor.yy454 = yymsp[-1].minor.yy454; yylhsminor.yy454.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); }
-  yymsp[-1].minor.yy454 = yylhsminor.yy454;
-        break;
-      case 101: /* db_optr ::= db_optr blocks */
-      case 116: /* alter_db_optr ::= alter_db_optr blocks */ yytestcase(yyruleno==116);
-{ yylhsminor.yy454 = yymsp[-1].minor.yy454; yylhsminor.yy454.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-  yymsp[-1].minor.yy454 = yylhsminor.yy454;
-        break;
-      case 102: /* db_optr ::= db_optr ctime */
-{ yylhsminor.yy454 = yymsp[-1].minor.yy454; yylhsminor.yy454.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-  yymsp[-1].minor.yy454 = yylhsminor.yy454;
-        break;
-      case 103: /* db_optr ::= db_optr wal */
-      case 118: /* alter_db_optr ::= alter_db_optr wal */ yytestcase(yyruleno==118);
-{ yylhsminor.yy454 = yymsp[-1].minor.yy454; yylhsminor.yy454.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-  yymsp[-1].minor.yy454 = yylhsminor.yy454;
-        break;
-      case 104: /* db_optr ::= db_optr fsync */
-      case 119: /* alter_db_optr ::= alter_db_optr fsync */ yytestcase(yyruleno==119);
-{ yylhsminor.yy454 = yymsp[-1].minor.yy454; yylhsminor.yy454.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-  yymsp[-1].minor.yy454 = yylhsminor.yy454;
-        break;
-      case 105: /* db_optr ::= db_optr comp */
-      case 117: /* alter_db_optr ::= alter_db_optr comp */ yytestcase(yyruleno==117);
-{ yylhsminor.yy454 = yymsp[-1].minor.yy454; yylhsminor.yy454.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-  yymsp[-1].minor.yy454 = yylhsminor.yy454;
-        break;
-      case 106: /* db_optr ::= db_optr prec */
-{ yylhsminor.yy454 = yymsp[-1].minor.yy454; yylhsminor.yy454.precision = yymsp[0].minor.yy0; }
-  yymsp[-1].minor.yy454 = yylhsminor.yy454;
-        break;
-      case 107: /* db_optr ::= db_optr keep */
-      case 115: /* alter_db_optr ::= alter_db_optr keep */ yytestcase(yyruleno==115);
-{ yylhsminor.yy454 = yymsp[-1].minor.yy454; yylhsminor.yy454.keep = yymsp[0].minor.yy15; }
-  yymsp[-1].minor.yy454 = yylhsminor.yy454;
-        break;
-      case 108: /* db_optr ::= db_optr update */
-      case 120: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==120);
-{ yylhsminor.yy454 = yymsp[-1].minor.yy454; yylhsminor.yy454.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-  yymsp[-1].minor.yy454 = yylhsminor.yy454;
-        break;
-      case 109: /* db_optr ::= db_optr cachelast */
-      case 121: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==121);
-{ yylhsminor.yy454 = yymsp[-1].minor.yy454; yylhsminor.yy454.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-  yymsp[-1].minor.yy454 = yylhsminor.yy454;
-        break;
-      case 110: /* topic_optr ::= db_optr */
-      case 122: /* alter_topic_optr ::= alter_db_optr */ yytestcase(yyruleno==122);
-{ yylhsminor.yy454 = yymsp[0].minor.yy454; yylhsminor.yy454.dbType = TSDB_DB_TYPE_TOPIC; }
-  yymsp[0].minor.yy454 = yylhsminor.yy454;
-        break;
-      case 111: /* topic_optr ::= topic_optr partitions */
-      case 123: /* alter_topic_optr ::= alter_topic_optr partitions */ yytestcase(yyruleno==123);
-{ yylhsminor.yy454 = yymsp[-1].minor.yy454; yylhsminor.yy454.partitions = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-  yymsp[-1].minor.yy454 = yylhsminor.yy454;
-        break;
-      case 112: /* alter_db_optr ::= */
-{ setDefaultCreateDbOption(&yymsp[1].minor.yy454); yymsp[1].minor.yy454.dbType = TSDB_DB_TYPE_DEFAULT;}
-        break;
-      case 124: /* typename ::= ids */
+      case 97: /* db_optr ::= */
+{setDefaultCreateDbOption(&yymsp[1].minor.yy372); yymsp[1].minor.yy372.dbType = TSDB_DB_TYPE_DEFAULT;}
+        break;
+      case 98: /* db_optr ::= db_optr cache */
+{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+  yymsp[-1].minor.yy372 = yylhsminor.yy372;
+        break;
+      case 99: /* db_optr ::= db_optr replica */
+      case 116: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==116);
+{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+  yymsp[-1].minor.yy372 = yylhsminor.yy372;
+        break;
+      case 100: /* db_optr ::= db_optr quorum */
+      case 117: /* alter_db_optr ::= alter_db_optr quorum */ yytestcase(yyruleno==117);
+{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+  yymsp[-1].minor.yy372 = yylhsminor.yy372;
+        break;
+      case 101: /* db_optr ::= db_optr days */
+{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+  yymsp[-1].minor.yy372 = yylhsminor.yy372;
+        break;
+      case 102: /* db_optr ::= db_optr minrows */
+{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); }
+  yymsp[-1].minor.yy372 = yylhsminor.yy372;
+        break;
+      case 103: /* db_optr ::= db_optr maxrows */
+{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); }
+  yymsp[-1].minor.yy372 = yylhsminor.yy372;
+        break;
+      case 104: /* db_optr ::= db_optr blocks */
+      case 119: /* alter_db_optr ::= alter_db_optr blocks */ yytestcase(yyruleno==119);
+{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+  yymsp[-1].minor.yy372 = yylhsminor.yy372;
+        break;
+      case 105: /* db_optr ::= db_optr ctime */
+{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+  yymsp[-1].minor.yy372 = yylhsminor.yy372;
+        break;
+      case 106: /* db_optr ::= db_optr wal */
+      case 121: /* alter_db_optr ::= alter_db_optr wal */ yytestcase(yyruleno==121);
+{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+  yymsp[-1].minor.yy372 = yylhsminor.yy372;
+        break;
+      case 107: /* db_optr ::= db_optr fsync */
+      case 122: /* alter_db_optr ::= alter_db_optr fsync */ yytestcase(yyruleno==122);
+{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+  yymsp[-1].minor.yy372 = yylhsminor.yy372;
+        break;
+      case 108: /* db_optr ::= db_optr comp */
+      case 120: /* alter_db_optr ::= alter_db_optr comp */ yytestcase(yyruleno==120);
+{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+  yymsp[-1].minor.yy372 = yylhsminor.yy372;
+        break;
+      case 109: /* db_optr ::= db_optr prec */
+{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.precision = yymsp[0].minor.yy0; }
+  yymsp[-1].minor.yy372 = yylhsminor.yy372;
+        break;
+      case 110: /* db_optr ::= db_optr keep */
+      case 118: /* alter_db_optr ::= alter_db_optr keep */ yytestcase(yyruleno==118);
+{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.keep = yymsp[0].minor.yy93; }
+  yymsp[-1].minor.yy372 = yylhsminor.yy372;
+        break;
+      case 111: /* db_optr ::= db_optr update */
+      case 123: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==123);
+{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+  yymsp[-1].minor.yy372 = yylhsminor.yy372;
+        break;
+      case 112: /* db_optr ::= db_optr cachelast */
+      case 124: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==124);
+{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+  yymsp[-1].minor.yy372 = yylhsminor.yy372;
+        break;
+      case 113: /* topic_optr ::= db_optr */
+      case 125: /* alter_topic_optr ::= alter_db_optr */ yytestcase(yyruleno==125);
+{ yylhsminor.yy372 = yymsp[0].minor.yy372; yylhsminor.yy372.dbType = TSDB_DB_TYPE_TOPIC; }
+  yymsp[0].minor.yy372 = yylhsminor.yy372;
+        break;
+      case 114: /* topic_optr ::= topic_optr partitions */
+      case 126: /* alter_topic_optr ::= alter_topic_optr partitions */ yytestcase(yyruleno==126);
+{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.partitions = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+  yymsp[-1].minor.yy372 = yylhsminor.yy372;
+        break;
+      case 115: /* alter_db_optr ::= */
+{ setDefaultCreateDbOption(&yymsp[1].minor.yy372); yymsp[1].minor.yy372.dbType = TSDB_DB_TYPE_DEFAULT;}
+        break;
+      case 127: /* typename ::= ids */
 { 
   yymsp[0].minor.yy0.type = 0;
-  tSetColumnType (&yylhsminor.yy505, &yymsp[0].minor.yy0);
+  tSetColumnType (&yylhsminor.yy325, &yymsp[0].minor.yy0);
 }
-  yymsp[0].minor.yy505 = yylhsminor.yy505;
+  yymsp[0].minor.yy325 = yylhsminor.yy325;
         break;
-      case 125: /* typename ::= ids LP signed RP */
+      case 128: /* typename ::= ids LP signed RP */
 {
-  if (yymsp[-1].minor.yy489 <= 0) {
+  if (yymsp[-1].minor.yy279 <= 0) {
     yymsp[-3].minor.yy0.type = 0;
-    tSetColumnType(&yylhsminor.yy505, &yymsp[-3].minor.yy0);
+    tSetColumnType(&yylhsminor.yy325, &yymsp[-3].minor.yy0);
   } else {
-    yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy489;  // negative value of name length
-    tSetColumnType(&yylhsminor.yy505, &yymsp[-3].minor.yy0);
+    yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy279;  // negative value of name length
+    tSetColumnType(&yylhsminor.yy325, &yymsp[-3].minor.yy0);
   }
 }
-  yymsp[-3].minor.yy505 = yylhsminor.yy505;
+  yymsp[-3].minor.yy325 = yylhsminor.yy325;
         break;
-      case 126: /* typename ::= ids UNSIGNED */
+      case 129: /* typename ::= ids UNSIGNED */
 {
   yymsp[-1].minor.yy0.type = 0;
   yymsp[-1].minor.yy0.n = ((yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z);
-  tSetColumnType (&yylhsminor.yy505, &yymsp[-1].minor.yy0);
+  tSetColumnType (&yylhsminor.yy325, &yymsp[-1].minor.yy0);
 }
-  yymsp[-1].minor.yy505 = yylhsminor.yy505;
+  yymsp[-1].minor.yy325 = yylhsminor.yy325;
         break;
-      case 127: /* signed ::= INTEGER */
-{ yylhsminor.yy489 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-  yymsp[0].minor.yy489 = yylhsminor.yy489;
+      case 130: /* signed ::= INTEGER */
+{ yylhsminor.yy279 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+  yymsp[0].minor.yy279 = yylhsminor.yy279;
         break;
-      case 128: /* signed ::= PLUS INTEGER */
-{ yymsp[-1].minor.yy489 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+      case 131: /* signed ::= PLUS INTEGER */
+{ yymsp[-1].minor.yy279 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
         break;
-      case 129: /* signed ::= MINUS INTEGER */
-{ yymsp[-1].minor.yy489 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);}
+      case 132: /* signed ::= MINUS INTEGER */
+{ yymsp[-1].minor.yy279 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);}
         break;
-      case 133: /* cmd ::= CREATE TABLE create_table_list */
-{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy482;}
+      case 136: /* cmd ::= CREATE TABLE create_table_list */
+{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy532;}
         break;
-      case 134: /* create_table_list ::= create_from_stable */
+      case 137: /* create_table_list ::= create_from_stable */
 {
   SCreateTableSql* pCreateTable = calloc(1, sizeof(SCreateTableSql));
   pCreateTable->childTableInfo = taosArrayInit(4, sizeof(SCreatedTableInfo));
 
-  taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy390);
+  taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy528);
   pCreateTable->type = TSQL_CREATE_TABLE_FROM_STABLE;
-  yylhsminor.yy482 = pCreateTable;
+  yylhsminor.yy532 = pCreateTable;
 }
-  yymsp[0].minor.yy482 = yylhsminor.yy482;
+  yymsp[0].minor.yy532 = yylhsminor.yy532;
         break;
-      case 135: /* create_table_list ::= create_table_list create_from_stable */
+      case 138: /* create_table_list ::= create_table_list create_from_stable */
 {
-  taosArrayPush(yymsp[-1].minor.yy482->childTableInfo, &yymsp[0].minor.yy390);
-  yylhsminor.yy482 = yymsp[-1].minor.yy482;
+  taosArrayPush(yymsp[-1].minor.yy532->childTableInfo, &yymsp[0].minor.yy528);
+  yylhsminor.yy532 = yymsp[-1].minor.yy532;
 }
-  yymsp[-1].minor.yy482 = yylhsminor.yy482;
+  yymsp[-1].minor.yy532 = yylhsminor.yy532;
         break;
-      case 136: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */
+      case 139: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */
 {
-  yylhsminor.yy482 = tSetCreateTableInfo(yymsp[-1].minor.yy15, NULL, NULL, TSQL_CREATE_TABLE);
-  setSqlInfo(pInfo, yylhsminor.yy482, NULL, TSDB_SQL_CREATE_TABLE);
+  yylhsminor.yy532 = tSetCreateTableInfo(yymsp[-1].minor.yy93, NULL, NULL, TSQL_CREATE_TABLE);
+  setSqlInfo(pInfo, yylhsminor.yy532, NULL, TSDB_SQL_CREATE_TABLE);
 
   yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
   setCreatedTableName(pInfo, &yymsp[-4].minor.yy0, &yymsp[-5].minor.yy0);
 }
-  yymsp[-5].minor.yy482 = yylhsminor.yy482;
+  yymsp[-5].minor.yy532 = yylhsminor.yy532;
         break;
-      case 137: /* create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */
+      case 140: /* create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */
 {
-  yylhsminor.yy482 = tSetCreateTableInfo(yymsp[-5].minor.yy15, yymsp[-1].minor.yy15, NULL, TSQL_CREATE_STABLE);
-  setSqlInfo(pInfo, yylhsminor.yy482, NULL, TSDB_SQL_CREATE_TABLE);
+  yylhsminor.yy532 = tSetCreateTableInfo(yymsp[-5].minor.yy93, yymsp[-1].minor.yy93, NULL, TSQL_CREATE_STABLE);
+  setSqlInfo(pInfo, yylhsminor.yy532, NULL, TSDB_SQL_CREATE_TABLE);
 
   yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n;
   setCreatedTableName(pInfo, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0);
 }
-  yymsp[-9].minor.yy482 = yylhsminor.yy482;
+  yymsp[-9].minor.yy532 = yylhsminor.yy532;
         break;
-      case 138: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */
+      case 141: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */
 {
   yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n;
   yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n;
-  yylhsminor.yy390 = createNewChildTableInfo(&yymsp[-5].minor.yy0, NULL, yymsp[-1].minor.yy15, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0);
+  yylhsminor.yy528 = createNewChildTableInfo(&yymsp[-5].minor.yy0, NULL, yymsp[-1].minor.yy93, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0);
 }
-  yymsp[-9].minor.yy390 = yylhsminor.yy390;
+  yymsp[-9].minor.yy528 = yylhsminor.yy528;
         break;
-      case 139: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */
+      case 142: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */
 {
   yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n;
   yymsp[-11].minor.yy0.n += yymsp[-10].minor.yy0.n;
-  yylhsminor.yy390 = createNewChildTableInfo(&yymsp[-8].minor.yy0, yymsp[-5].minor.yy15, yymsp[-1].minor.yy15, &yymsp[-11].minor.yy0, &yymsp[-12].minor.yy0);
+  yylhsminor.yy528 = createNewChildTableInfo(&yymsp[-8].minor.yy0, yymsp[-5].minor.yy93, yymsp[-1].minor.yy93, &yymsp[-11].minor.yy0, &yymsp[-12].minor.yy0);
 }
-  yymsp[-12].minor.yy390 = yylhsminor.yy390;
+  yymsp[-12].minor.yy528 = yylhsminor.yy528;
         break;
-      case 140: /* tagNamelist ::= tagNamelist COMMA ids */
-{taosArrayPush(yymsp[-2].minor.yy15, &yymsp[0].minor.yy0); yylhsminor.yy15 = yymsp[-2].minor.yy15;  }
-  yymsp[-2].minor.yy15 = yylhsminor.yy15;
+      case 143: /* tagNamelist ::= tagNamelist COMMA ids */
+{taosArrayPush(yymsp[-2].minor.yy93, &yymsp[0].minor.yy0); yylhsminor.yy93 = yymsp[-2].minor.yy93;  }
+  yymsp[-2].minor.yy93 = yylhsminor.yy93;
         break;
-      case 141: /* tagNamelist ::= ids */
-{yylhsminor.yy15 = taosArrayInit(4, sizeof(SStrToken)); taosArrayPush(yylhsminor.yy15, &yymsp[0].minor.yy0);}
-  yymsp[0].minor.yy15 = yylhsminor.yy15;
+      case 144: /* tagNamelist ::= ids */
+{yylhsminor.yy93 = taosArrayInit(4, sizeof(SStrToken)); taosArrayPush(yylhsminor.yy93, &yymsp[0].minor.yy0);}
+  yymsp[0].minor.yy93 = yylhsminor.yy93;
         break;
-      case 142: /* create_table_args ::= ifnotexists ids cpxName AS select */
+      case 145: /* create_table_args ::= ifnotexists ids cpxName AS select */
 {
-  yylhsminor.yy482 = tSetCreateTableInfo(NULL, NULL, yymsp[0].minor.yy134, TSQL_CREATE_STREAM);
-  setSqlInfo(pInfo, yylhsminor.yy482, NULL, TSDB_SQL_CREATE_TABLE);
+  yylhsminor.yy532 = tSetCreateTableInfo(NULL, NULL, yymsp[0].minor.yy224, TSQL_CREATE_STREAM);
+  setSqlInfo(pInfo, yylhsminor.yy532, NULL, TSDB_SQL_CREATE_TABLE);
 
   yymsp[-3].minor.yy0.n += yymsp[-2].minor.yy0.n;
   setCreatedTableName(pInfo, &yymsp[-3].minor.yy0, &yymsp[-4].minor.yy0);
 }
-  yymsp[-4].minor.yy482 = yylhsminor.yy482;
+  yymsp[-4].minor.yy532 = yylhsminor.yy532;
         break;
-      case 143: /* columnlist ::= columnlist COMMA column */
-{taosArrayPush(yymsp[-2].minor.yy15, &yymsp[0].minor.yy505); yylhsminor.yy15 = yymsp[-2].minor.yy15;  }
-  yymsp[-2].minor.yy15 = yylhsminor.yy15;
+      case 146: /* columnlist ::= columnlist COMMA column */
+{taosArrayPush(yymsp[-2].minor.yy93, &yymsp[0].minor.yy325); yylhsminor.yy93 = yymsp[-2].minor.yy93;  }
+  yymsp[-2].minor.yy93 = yylhsminor.yy93;
         break;
-      case 144: /* columnlist ::= column */
-{yylhsminor.yy15 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yylhsminor.yy15, &yymsp[0].minor.yy505);}
-  yymsp[0].minor.yy15 = yylhsminor.yy15;
+      case 147: /* columnlist ::= column */
+{yylhsminor.yy93 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yylhsminor.yy93, &yymsp[0].minor.yy325);}
+  yymsp[0].minor.yy93 = yylhsminor.yy93;
         break;
-      case 145: /* column ::= ids typename */
+      case 148: /* column ::= ids typename */
 {
-  tSetColumnInfo(&yylhsminor.yy505, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy505);
+  tSetColumnInfo(&yylhsminor.yy325, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy325);
 }
-  yymsp[-1].minor.yy505 = yylhsminor.yy505;
-        break;
-      case 146: /* tagitemlist ::= tagitemlist COMMA tagitem */
-{ yylhsminor.yy15 = tVariantListAppend(yymsp[-2].minor.yy15, &yymsp[0].minor.yy380, -1);    }
-  yymsp[-2].minor.yy15 = yylhsminor.yy15;
-        break;
-      case 147: /* tagitemlist ::= tagitem */
-{ yylhsminor.yy15 = tVariantListAppend(NULL, &yymsp[0].minor.yy380, -1); }
-  yymsp[0].minor.yy15 = yylhsminor.yy15;
-        break;
-      case 148: /* tagitem ::= INTEGER */
-      case 149: /* tagitem ::= FLOAT */ yytestcase(yyruleno==149);
-      case 150: /* tagitem ::= STRING */ yytestcase(yyruleno==150);
-      case 151: /* tagitem ::= BOOL */ yytestcase(yyruleno==151);
-{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy380, &yymsp[0].minor.yy0); }
-  yymsp[0].minor.yy380 = yylhsminor.yy380;
+  yymsp[-1].minor.yy325 = yylhsminor.yy325;
         break;
-      case 152: /* tagitem ::= NULL */
-{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy380, &yymsp[0].minor.yy0); }
-  yymsp[0].minor.yy380 = yylhsminor.yy380;
+      case 155: /* tagitem ::= NULL */
+{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy518, &yymsp[0].minor.yy0); }
+  yymsp[0].minor.yy518 = yylhsminor.yy518;
         break;
-      case 153: /* tagitem ::= MINUS INTEGER */
-      case 154: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==154);
-      case 155: /* tagitem ::= PLUS INTEGER */ yytestcase(yyruleno==155);
-      case 156: /* tagitem ::= PLUS FLOAT */ yytestcase(yyruleno==156);
+      case 156: /* tagitem ::= MINUS INTEGER */
+      case 157: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==157);
+      case 158: /* tagitem ::= PLUS INTEGER */ yytestcase(yyruleno==158);
+      case 159: /* tagitem ::= PLUS FLOAT */ yytestcase(yyruleno==159);
 {
     yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
     yymsp[-1].minor.yy0.type = yymsp[0].minor.yy0.type;
     toTSDBType(yymsp[-1].minor.yy0.type);
-    tVariantCreate(&yylhsminor.yy380, &yymsp[-1].minor.yy0);
+    tVariantCreate(&yylhsminor.yy518, &yymsp[-1].minor.yy0);
 }
-  yymsp[-1].minor.yy380 = yylhsminor.yy380;
+  yymsp[-1].minor.yy518 = yylhsminor.yy518;
         break;
-      case 157: /* select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */
+      case 160: /* select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */
 {
-  yylhsminor.yy134 = tSetQuerySqlNode(&yymsp[-13].minor.yy0, yymsp[-12].minor.yy15, yymsp[-11].minor.yy160, yymsp[-10].minor.yy328, yymsp[-4].minor.yy15, yymsp[-3].minor.yy15, &yymsp[-9].minor.yy496, &yymsp[-8].minor.yy151, &yymsp[-7].minor.yy96, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy15, &yymsp[0].minor.yy150, &yymsp[-1].minor.yy150, yymsp[-2].minor.yy328);
+  yylhsminor.yy224 = tSetQuerySqlNode(&yymsp[-13].minor.yy0, yymsp[-12].minor.yy93, yymsp[-11].minor.yy330, yymsp[-10].minor.yy68, yymsp[-4].minor.yy93, yymsp[-3].minor.yy93, &yymsp[-9].minor.yy42, &yymsp[-8].minor.yy15, &yymsp[-7].minor.yy274, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy93, &yymsp[0].minor.yy284, &yymsp[-1].minor.yy284, yymsp[-2].minor.yy68);
 }
-  yymsp[-13].minor.yy134 = yylhsminor.yy134;
+  yymsp[-13].minor.yy224 = yylhsminor.yy224;
         break;
-      case 158: /* select ::= LP select RP */
-{yymsp[-2].minor.yy134 = yymsp[-1].minor.yy134;}
+      case 161: /* select ::= LP select RP */
+{yymsp[-2].minor.yy224 = yymsp[-1].minor.yy224;}
         break;
-      case 159: /* union ::= select */
-{ yylhsminor.yy15 = setSubclause(NULL, yymsp[0].minor.yy134); }
-  yymsp[0].minor.yy15 = yylhsminor.yy15;
+      case 162: /* union ::= select */
+{ yylhsminor.yy93 = setSubclause(NULL, yymsp[0].minor.yy224); }
+  yymsp[0].minor.yy93 = yylhsminor.yy93;
         break;
-      case 160: /* union ::= union UNION ALL select */
-{ yylhsminor.yy15 = appendSelectClause(yymsp[-3].minor.yy15, yymsp[0].minor.yy134); }
-  yymsp[-3].minor.yy15 = yylhsminor.yy15;
+      case 163: /* union ::= union UNION ALL select */
+{ yylhsminor.yy93 = appendSelectClause(yymsp[-3].minor.yy93, yymsp[0].minor.yy224); }
+  yymsp[-3].minor.yy93 = yylhsminor.yy93;
         break;
-      case 161: /* cmd ::= union */
-{ setSqlInfo(pInfo, yymsp[0].minor.yy15, NULL, TSDB_SQL_SELECT); }
+      case 164: /* cmd ::= union */
+{ setSqlInfo(pInfo, yymsp[0].minor.yy93, NULL, TSDB_SQL_SELECT); }
         break;
-      case 162: /* select ::= SELECT selcollist */
+      case 165: /* select ::= SELECT selcollist */
 {
-  yylhsminor.yy134 = tSetQuerySqlNode(&yymsp[-1].minor.yy0, yymsp[0].minor.yy15, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+  yylhsminor.yy224 = tSetQuerySqlNode(&yymsp[-1].minor.yy0, yymsp[0].minor.yy93, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 }
-  yymsp[-1].minor.yy134 = yylhsminor.yy134;
+  yymsp[-1].minor.yy224 = yylhsminor.yy224;
         break;
-      case 163: /* sclp ::= selcollist COMMA */
-{yylhsminor.yy15 = yymsp[-1].minor.yy15;}
-  yymsp[-1].minor.yy15 = yylhsminor.yy15;
+      case 166: /* sclp ::= selcollist COMMA */
+{yylhsminor.yy93 = yymsp[-1].minor.yy93;}
+  yymsp[-1].minor.yy93 = yylhsminor.yy93;
         break;
-      case 164: /* sclp ::= */
-      case 194: /* orderby_opt ::= */ yytestcase(yyruleno==194);
-{yymsp[1].minor.yy15 = 0;}
+      case 167: /* sclp ::= */
+      case 197: /* orderby_opt ::= */ yytestcase(yyruleno==197);
+{yymsp[1].minor.yy93 = 0;}
         break;
-      case 165: /* selcollist ::= sclp distinct expr as */
+      case 168: /* selcollist ::= sclp distinct expr as */
 {
-   yylhsminor.yy15 = tSqlExprListAppend(yymsp[-3].minor.yy15, yymsp[-1].minor.yy328,  yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0);
+   yylhsminor.yy93 = tSqlExprListAppend(yymsp[-3].minor.yy93, yymsp[-1].minor.yy68,  yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0);
 }
-  yymsp[-3].minor.yy15 = yylhsminor.yy15;
+  yymsp[-3].minor.yy93 = yylhsminor.yy93;
         break;
-      case 166: /* selcollist ::= sclp STAR */
+      case 169: /* selcollist ::= sclp STAR */
 {
    tSqlExpr *pNode = tSqlExprCreateIdValue(NULL, TK_ALL);
-   yylhsminor.yy15 = tSqlExprListAppend(yymsp[-1].minor.yy15, pNode, 0, 0);
+   yylhsminor.yy93 = tSqlExprListAppend(yymsp[-1].minor.yy93, pNode, 0, 0);
 }
-  yymsp[-1].minor.yy15 = yylhsminor.yy15;
+  yymsp[-1].minor.yy93 = yylhsminor.yy93;
         break;
-      case 167: /* as ::= AS ids */
+      case 170: /* as ::= AS ids */
 { yymsp[-1].minor.yy0 = yymsp[0].minor.yy0;    }
         break;
-      case 168: /* as ::= ids */
+      case 171: /* as ::= ids */
 { yylhsminor.yy0 = yymsp[0].minor.yy0;    }
   yymsp[0].minor.yy0 = yylhsminor.yy0;
         break;
-      case 169: /* as ::= */
+      case 172: /* as ::= */
 { yymsp[1].minor.yy0.n = 0;  }
         break;
-      case 170: /* distinct ::= DISTINCT */
+      case 173: /* distinct ::= DISTINCT */
 { yylhsminor.yy0 = yymsp[0].minor.yy0;  }
   yymsp[0].minor.yy0 = yylhsminor.yy0;
         break;
-      case 172: /* from ::= FROM tablelist */
-      case 173: /* from ::= FROM sub */ yytestcase(yyruleno==173);
-{yymsp[-1].minor.yy160 = yymsp[0].minor.yy160;}
+      case 175: /* from ::= FROM tablelist */
+      case 176: /* from ::= FROM sub */ yytestcase(yyruleno==176);
+{yymsp[-1].minor.yy330 = yymsp[0].minor.yy330;}
         break;
-      case 174: /* sub ::= LP union RP */
-{yymsp[-2].minor.yy160 = addSubqueryElem(NULL, yymsp[-1].minor.yy15, NULL);}
+      case 177: /* sub ::= LP union RP */
+{yymsp[-2].minor.yy330 = addSubqueryElem(NULL, yymsp[-1].minor.yy93, NULL);}
         break;
-      case 175: /* sub ::= LP union RP ids */
-{yymsp[-3].minor.yy160 = addSubqueryElem(NULL, yymsp[-2].minor.yy15, &yymsp[0].minor.yy0);}
+      case 178: /* sub ::= LP union RP ids */
+{yymsp[-3].minor.yy330 = addSubqueryElem(NULL, yymsp[-2].minor.yy93, &yymsp[0].minor.yy0);}
         break;
-      case 176: /* sub ::= sub COMMA LP union RP ids */
-{yylhsminor.yy160 = addSubqueryElem(yymsp[-5].minor.yy160, yymsp[-2].minor.yy15, &yymsp[0].minor.yy0);}
-  yymsp[-5].minor.yy160 = yylhsminor.yy160;
+      case 179: /* sub ::= sub COMMA LP union RP ids */
+{yylhsminor.yy330 = addSubqueryElem(yymsp[-5].minor.yy330, yymsp[-2].minor.yy93, &yymsp[0].minor.yy0);}
+  yymsp[-5].minor.yy330 = yylhsminor.yy330;
         break;
-      case 177: /* tablelist ::= ids cpxName */
+      case 180: /* tablelist ::= ids cpxName */
 {
   yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
-  yylhsminor.yy160 = setTableNameList(NULL, &yymsp[-1].minor.yy0, NULL);
+  yylhsminor.yy330 = setTableNameList(NULL, &yymsp[-1].minor.yy0, NULL);
 }
-  yymsp[-1].minor.yy160 = yylhsminor.yy160;
+  yymsp[-1].minor.yy330 = yylhsminor.yy330;
         break;
-      case 178: /* tablelist ::= ids cpxName ids */
+      case 181: /* tablelist ::= ids cpxName ids */
 {
   yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n;
-  yylhsminor.yy160 = setTableNameList(NULL, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);
+  yylhsminor.yy330 = setTableNameList(NULL, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);
 }
-  yymsp[-2].minor.yy160 = yylhsminor.yy160;
+  yymsp[-2].minor.yy330 = yylhsminor.yy330;
         break;
-      case 179: /* tablelist ::= tablelist COMMA ids cpxName */
+      case 182: /* tablelist ::= tablelist COMMA ids cpxName */
 {
   yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
-  yylhsminor.yy160 = setTableNameList(yymsp[-3].minor.yy160, &yymsp[-1].minor.yy0, NULL);
+  yylhsminor.yy330 = setTableNameList(yymsp[-3].minor.yy330, &yymsp[-1].minor.yy0, NULL);
 }
-  yymsp[-3].minor.yy160 = yylhsminor.yy160;
+  yymsp[-3].minor.yy330 = yylhsminor.yy330;
         break;
-      case 180: /* tablelist ::= tablelist COMMA ids cpxName ids */
+      case 183: /* tablelist ::= tablelist COMMA ids cpxName ids */
 {
   yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n;
-  yylhsminor.yy160 = setTableNameList(yymsp[-4].minor.yy160, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);
+  yylhsminor.yy330 = setTableNameList(yymsp[-4].minor.yy330, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);
 }
-  yymsp[-4].minor.yy160 = yylhsminor.yy160;
+  yymsp[-4].minor.yy330 = yylhsminor.yy330;
         break;
-      case 181: /* tmvar ::= VARIABLE */
+      case 184: /* tmvar ::= VARIABLE */
 {yylhsminor.yy0 = yymsp[0].minor.yy0;}
   yymsp[0].minor.yy0 = yylhsminor.yy0;
         break;
-      case 182: /* interval_opt ::= INTERVAL LP tmvar RP */
-{yymsp[-3].minor.yy496.interval = yymsp[-1].minor.yy0; yymsp[-3].minor.yy496.offset.n = 0;}
+      case 185: /* interval_opt ::= INTERVAL LP tmvar RP */
+{yymsp[-3].minor.yy42.interval = yymsp[-1].minor.yy0; yymsp[-3].minor.yy42.offset.n = 0;}
         break;
-      case 183: /* interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */
-{yymsp[-5].minor.yy496.interval = yymsp[-3].minor.yy0; yymsp[-5].minor.yy496.offset = yymsp[-1].minor.yy0;}
+      case 186: /* interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */
+{yymsp[-5].minor.yy42.interval = yymsp[-3].minor.yy0; yymsp[-5].minor.yy42.offset = yymsp[-1].minor.yy0;}
         break;
-      case 184: /* interval_opt ::= */
-{memset(&yymsp[1].minor.yy496, 0, sizeof(yymsp[1].minor.yy496));}
+      case 187: /* interval_opt ::= */
+{memset(&yymsp[1].minor.yy42, 0, sizeof(yymsp[1].minor.yy42));}
         break;
-      case 185: /* session_option ::= */
-{yymsp[1].minor.yy151.col.n = 0; yymsp[1].minor.yy151.gap.n = 0;}
+      case 188: /* session_option ::= */
+{yymsp[1].minor.yy15.col.n = 0; yymsp[1].minor.yy15.gap.n = 0;}
         break;
-      case 186: /* session_option ::= SESSION LP ids cpxName COMMA tmvar RP */
+      case 189: /* session_option ::= SESSION LP ids cpxName COMMA tmvar RP */
 {
    yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
-   yymsp[-6].minor.yy151.col = yymsp[-4].minor.yy0;
-   yymsp[-6].minor.yy151.gap = yymsp[-1].minor.yy0;
+   yymsp[-6].minor.yy15.col = yymsp[-4].minor.yy0;
+   yymsp[-6].minor.yy15.gap = yymsp[-1].minor.yy0;
 }
         break;
-      case 187: /* windowstate_option ::= */
-{ yymsp[1].minor.yy96.col.n = 0; yymsp[1].minor.yy96.col.z = NULL;}
+      case 190: /* windowstate_option ::= */
+{ yymsp[1].minor.yy274.col.n = 0; yymsp[1].minor.yy274.col.z = NULL;}
         break;
-      case 188: /* windowstate_option ::= STATE_WINDOW LP ids RP */
-{ yymsp[-3].minor.yy96.col = yymsp[-1].minor.yy0; }
+      case 191: /* windowstate_option ::= STATE_WINDOW LP ids RP */
+{ yymsp[-3].minor.yy274.col = yymsp[-1].minor.yy0; }
         break;
-      case 189: /* fill_opt ::= */
-{ yymsp[1].minor.yy15 = 0;     }
+      case 192: /* fill_opt ::= */
+{ yymsp[1].minor.yy93 = 0;     }
         break;
-      case 190: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */
+      case 193: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */
 {
     tVariant A = {0};
     toTSDBType(yymsp[-3].minor.yy0.type);
     tVariantCreate(&A, &yymsp[-3].minor.yy0);
 
-    tVariantListInsert(yymsp[-1].minor.yy15, &A, -1, 0);
-    yymsp[-5].minor.yy15 = yymsp[-1].minor.yy15;
+    tVariantListInsert(yymsp[-1].minor.yy93, &A, -1, 0);
+    yymsp[-5].minor.yy93 = yymsp[-1].minor.yy93;
 }
         break;
-      case 191: /* fill_opt ::= FILL LP ID RP */
+      case 194: /* fill_opt ::= FILL LP ID RP */
 {
     toTSDBType(yymsp[-1].minor.yy0.type);
-    yymsp[-3].minor.yy15 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1);
+    yymsp[-3].minor.yy93 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1);
 }
         break;
-      case 192: /* sliding_opt ::= SLIDING LP tmvar RP */
+      case 195: /* sliding_opt ::= SLIDING LP tmvar RP */
 {yymsp[-3].minor.yy0 = yymsp[-1].minor.yy0;     }
         break;
-      case 193: /* sliding_opt ::= */
+      case 196: /* sliding_opt ::= */
 {yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = NULL; yymsp[1].minor.yy0.type = 0;   }
         break;
-      case 195: /* orderby_opt ::= ORDER BY sortlist */
-{yymsp[-2].minor.yy15 = yymsp[0].minor.yy15;}
+      case 198: /* orderby_opt ::= ORDER BY sortlist */
+{yymsp[-2].minor.yy93 = yymsp[0].minor.yy93;}
         break;
-      case 196: /* sortlist ::= sortlist COMMA item sortorder */
+      case 199: /* sortlist ::= sortlist COMMA item sortorder */
 {
-    yylhsminor.yy15 = tVariantListAppend(yymsp[-3].minor.yy15, &yymsp[-1].minor.yy380, yymsp[0].minor.yy250);
+    yylhsminor.yy93 = tVariantListAppend(yymsp[-3].minor.yy93, &yymsp[-1].minor.yy518, yymsp[0].minor.yy150);
 }
-  yymsp[-3].minor.yy15 = yylhsminor.yy15;
+  yymsp[-3].minor.yy93 = yylhsminor.yy93;
         break;
-      case 197: /* sortlist ::= item sortorder */
+      case 200: /* sortlist ::= item sortorder */
 {
-  yylhsminor.yy15 = tVariantListAppend(NULL, &yymsp[-1].minor.yy380, yymsp[0].minor.yy250);
+  yylhsminor.yy93 = tVariantListAppend(NULL, &yymsp[-1].minor.yy518, yymsp[0].minor.yy150);
 }
-  yymsp[-1].minor.yy15 = yylhsminor.yy15;
+  yymsp[-1].minor.yy93 = yylhsminor.yy93;
         break;
-      case 198: /* item ::= ids cpxName */
+      case 201: /* item ::= ids cpxName */
 {
   toTSDBType(yymsp[-1].minor.yy0.type);
   yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
 
-  tVariantCreate(&yylhsminor.yy380, &yymsp[-1].minor.yy0);
+  tVariantCreate(&yylhsminor.yy518, &yymsp[-1].minor.yy0);
 }
-  yymsp[-1].minor.yy380 = yylhsminor.yy380;
+  yymsp[-1].minor.yy518 = yylhsminor.yy518;
         break;
-      case 199: /* sortorder ::= ASC */
-{ yymsp[0].minor.yy250 = TSDB_ORDER_ASC; }
+      case 202: /* sortorder ::= ASC */
+{ yymsp[0].minor.yy150 = TSDB_ORDER_ASC; }
         break;
-      case 200: /* sortorder ::= DESC */
-{ yymsp[0].minor.yy250 = TSDB_ORDER_DESC;}
+      case 203: /* sortorder ::= DESC */
+{ yymsp[0].minor.yy150 = TSDB_ORDER_DESC;}
         break;
-      case 201: /* sortorder ::= */
-{ yymsp[1].minor.yy250 = TSDB_ORDER_ASC; }
+      case 204: /* sortorder ::= */
+{ yymsp[1].minor.yy150 = TSDB_ORDER_ASC; }
         break;
-      case 202: /* groupby_opt ::= */
-{ yymsp[1].minor.yy15 = 0;}
+      case 205: /* groupby_opt ::= */
+{ yymsp[1].minor.yy93 = 0;}
         break;
-      case 203: /* groupby_opt ::= GROUP BY grouplist */
-{ yymsp[-2].minor.yy15 = yymsp[0].minor.yy15;}
+      case 206: /* groupby_opt ::= GROUP BY grouplist */
+{ yymsp[-2].minor.yy93 = yymsp[0].minor.yy93;}
         break;
-      case 204: /* grouplist ::= grouplist COMMA item */
+      case 207: /* grouplist ::= grouplist COMMA item */
 {
-  yylhsminor.yy15 = tVariantListAppend(yymsp[-2].minor.yy15, &yymsp[0].minor.yy380, -1);
+  yylhsminor.yy93 = tVariantListAppend(yymsp[-2].minor.yy93, &yymsp[0].minor.yy518, -1);
 }
-  yymsp[-2].minor.yy15 = yylhsminor.yy15;
+  yymsp[-2].minor.yy93 = yylhsminor.yy93;
         break;
-      case 205: /* grouplist ::= item */
+      case 208: /* grouplist ::= item */
 {
-  yylhsminor.yy15 = tVariantListAppend(NULL, &yymsp[0].minor.yy380, -1);
+  yylhsminor.yy93 = tVariantListAppend(NULL, &yymsp[0].minor.yy518, -1);
 }
-  yymsp[0].minor.yy15 = yylhsminor.yy15;
+  yymsp[0].minor.yy93 = yylhsminor.yy93;
         break;
-      case 206: /* having_opt ::= */
-      case 216: /* where_opt ::= */ yytestcase(yyruleno==216);
-      case 258: /* expritem ::= */ yytestcase(yyruleno==258);
-{yymsp[1].minor.yy328 = 0;}
+      case 209: /* having_opt ::= */
+      case 219: /* where_opt ::= */ yytestcase(yyruleno==219);
+      case 261: /* expritem ::= */ yytestcase(yyruleno==261);
+{yymsp[1].minor.yy68 = 0;}
         break;
-      case 207: /* having_opt ::= HAVING expr */
-      case 217: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==217);
-{yymsp[-1].minor.yy328 = yymsp[0].minor.yy328;}
+      case 210: /* having_opt ::= HAVING expr */
+      case 220: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==220);
+{yymsp[-1].minor.yy68 = yymsp[0].minor.yy68;}
         break;
-      case 208: /* limit_opt ::= */
-      case 212: /* slimit_opt ::= */ yytestcase(yyruleno==212);
-{yymsp[1].minor.yy150.limit = -1; yymsp[1].minor.yy150.offset = 0;}
+      case 211: /* limit_opt ::= */
+      case 215: /* slimit_opt ::= */ yytestcase(yyruleno==215);
+{yymsp[1].minor.yy284.limit = -1; yymsp[1].minor.yy284.offset = 0;}
         break;
-      case 209: /* limit_opt ::= LIMIT signed */
-      case 213: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==213);
-{yymsp[-1].minor.yy150.limit = yymsp[0].minor.yy489;  yymsp[-1].minor.yy150.offset = 0;}
+      case 212: /* limit_opt ::= LIMIT signed */
+      case 216: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==216);
+{yymsp[-1].minor.yy284.limit = yymsp[0].minor.yy279;  yymsp[-1].minor.yy284.offset = 0;}
         break;
-      case 210: /* limit_opt ::= LIMIT signed OFFSET signed */
-{ yymsp[-3].minor.yy150.limit = yymsp[-2].minor.yy489;  yymsp[-3].minor.yy150.offset = yymsp[0].minor.yy489;}
+      case 213: /* limit_opt ::= LIMIT signed OFFSET signed */
+{ yymsp[-3].minor.yy284.limit = yymsp[-2].minor.yy279;  yymsp[-3].minor.yy284.offset = yymsp[0].minor.yy279;}
         break;
-      case 211: /* limit_opt ::= LIMIT signed COMMA signed */
-{ yymsp[-3].minor.yy150.limit = yymsp[0].minor.yy489;  yymsp[-3].minor.yy150.offset = yymsp[-2].minor.yy489;}
+      case 214: /* limit_opt ::= LIMIT signed COMMA signed */
+{ yymsp[-3].minor.yy284.limit = yymsp[0].minor.yy279;  yymsp[-3].minor.yy284.offset = yymsp[-2].minor.yy279;}
         break;
-      case 214: /* slimit_opt ::= SLIMIT signed SOFFSET signed */
-{yymsp[-3].minor.yy150.limit = yymsp[-2].minor.yy489;  yymsp[-3].minor.yy150.offset = yymsp[0].minor.yy489;}
+      case 217: /* slimit_opt ::= SLIMIT signed SOFFSET signed */
+{yymsp[-3].minor.yy284.limit = yymsp[-2].minor.yy279;  yymsp[-3].minor.yy284.offset = yymsp[0].minor.yy279;}
         break;
-      case 215: /* slimit_opt ::= SLIMIT signed COMMA signed */
-{yymsp[-3].minor.yy150.limit = yymsp[0].minor.yy489;  yymsp[-3].minor.yy150.offset = yymsp[-2].minor.yy489;}
+      case 218: /* slimit_opt ::= SLIMIT signed COMMA signed */
+{yymsp[-3].minor.yy284.limit = yymsp[0].minor.yy279;  yymsp[-3].minor.yy284.offset = yymsp[-2].minor.yy279;}
         break;
-      case 218: /* expr ::= LP expr RP */
-{yylhsminor.yy328 = yymsp[-1].minor.yy328; yylhsminor.yy328->token.z = yymsp[-2].minor.yy0.z; yylhsminor.yy328->token.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);}
-  yymsp[-2].minor.yy328 = yylhsminor.yy328;
+      case 221: /* expr ::= LP expr RP */
+{yylhsminor.yy68 = yymsp[-1].minor.yy68; yylhsminor.yy68->token.z = yymsp[-2].minor.yy0.z; yylhsminor.yy68->token.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);}
+  yymsp[-2].minor.yy68 = yylhsminor.yy68;
         break;
-      case 219: /* expr ::= ID */
-{ yylhsminor.yy328 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_ID);}
-  yymsp[0].minor.yy328 = yylhsminor.yy328;
+      case 222: /* expr ::= ID */
+{ yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_ID);}
+  yymsp[0].minor.yy68 = yylhsminor.yy68;
         break;
-      case 220: /* expr ::= ID DOT ID */
-{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy328 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ID);}
-  yymsp[-2].minor.yy328 = yylhsminor.yy328;
+      case 223: /* expr ::= ID DOT ID */
+{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ID);}
+  yymsp[-2].minor.yy68 = yylhsminor.yy68;
         break;
-      case 221: /* expr ::= ID DOT STAR */
-{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy328 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ALL);}
-  yymsp[-2].minor.yy328 = yylhsminor.yy328;
+      case 224: /* expr ::= ID DOT STAR */
+{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ALL);}
+  yymsp[-2].minor.yy68 = yylhsminor.yy68;
         break;
-      case 222: /* expr ::= INTEGER */
-{ yylhsminor.yy328 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_INTEGER);}
-  yymsp[0].minor.yy328 = yylhsminor.yy328;
+      case 225: /* expr ::= INTEGER */
+{ yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_INTEGER);}
+  yymsp[0].minor.yy68 = yylhsminor.yy68;
         break;
-      case 223: /* expr ::= MINUS INTEGER */
-      case 224: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==224);
-{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy328 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_INTEGER);}
-  yymsp[-1].minor.yy328 = yylhsminor.yy328;
+      case 226: /* expr ::= MINUS INTEGER */
+      case 227: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==227);
+{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_INTEGER);}
+  yymsp[-1].minor.yy68 = yylhsminor.yy68;
         break;
-      case 225: /* expr ::= FLOAT */
-{ yylhsminor.yy328 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_FLOAT);}
-  yymsp[0].minor.yy328 = yylhsminor.yy328;
+      case 228: /* expr ::= FLOAT */
+{ yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_FLOAT);}
+  yymsp[0].minor.yy68 = yylhsminor.yy68;
         break;
-      case 226: /* expr ::= MINUS FLOAT */
-      case 227: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==227);
-{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy328 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_FLOAT);}
-  yymsp[-1].minor.yy328 = yylhsminor.yy328;
+      case 229: /* expr ::= MINUS FLOAT */
+      case 230: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==230);
+{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_FLOAT);}
+  yymsp[-1].minor.yy68 = yylhsminor.yy68;
         break;
-      case 228: /* expr ::= STRING */
-{ yylhsminor.yy328 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_STRING);}
-  yymsp[0].minor.yy328 = yylhsminor.yy328;
+      case 231: /* expr ::= STRING */
+{ yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_STRING);}
+  yymsp[0].minor.yy68 = yylhsminor.yy68;
         break;
-      case 229: /* expr ::= NOW */
-{ yylhsminor.yy328 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NOW); }
-  yymsp[0].minor.yy328 = yylhsminor.yy328;
+      case 232: /* expr ::= NOW */
+{ yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NOW); }
+  yymsp[0].minor.yy68 = yylhsminor.yy68;
         break;
-      case 230: /* expr ::= VARIABLE */
-{ yylhsminor.yy328 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_VARIABLE);}
-  yymsp[0].minor.yy328 = yylhsminor.yy328;
+      case 233: /* expr ::= VARIABLE */
+{ yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_VARIABLE);}
+  yymsp[0].minor.yy68 = yylhsminor.yy68;
         break;
-      case 231: /* expr ::= PLUS VARIABLE */
-      case 232: /* expr ::= MINUS VARIABLE */ yytestcase(yyruleno==232);
-{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_VARIABLE; yylhsminor.yy328 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_VARIABLE);}
-  yymsp[-1].minor.yy328 = yylhsminor.yy328;
+      case 234: /* expr ::= PLUS VARIABLE */
+      case 235: /* expr ::= MINUS VARIABLE */ yytestcase(yyruleno==235);
+{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_VARIABLE; yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_VARIABLE);}
+  yymsp[-1].minor.yy68 = yylhsminor.yy68;
         break;
-      case 233: /* expr ::= BOOL */
-{ yylhsminor.yy328 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_BOOL);}
-  yymsp[0].minor.yy328 = yylhsminor.yy328;
+      case 236: /* expr ::= BOOL */
+{ yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_BOOL);}
+  yymsp[0].minor.yy68 = yylhsminor.yy68;
         break;
-      case 234: /* expr ::= NULL */
-{ yylhsminor.yy328 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NULL);}
-  yymsp[0].minor.yy328 = yylhsminor.yy328;
+      case 237: /* expr ::= NULL */
+{ yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NULL);}
+  yymsp[0].minor.yy68 = yylhsminor.yy68;
         break;
-      case 235: /* expr ::= ID LP exprlist RP */
-{ yylhsminor.yy328 = tSqlExprCreateFunction(yymsp[-1].minor.yy15, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); }
-  yymsp[-3].minor.yy328 = yylhsminor.yy328;
+      case 238: /* expr ::= ID LP exprlist RP */
+{ yylhsminor.yy68 = tSqlExprCreateFunction(yymsp[-1].minor.yy93, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); }
+  yymsp[-3].minor.yy68 = yylhsminor.yy68;
         break;
-      case 236: /* expr ::= ID LP STAR RP */
-{ yylhsminor.yy328 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); }
-  yymsp[-3].minor.yy328 = yylhsminor.yy328;
+      case 239: /* expr ::= ID LP STAR RP */
+{ yylhsminor.yy68 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); }
+  yymsp[-3].minor.yy68 = yylhsminor.yy68;
         break;
-      case 237: /* expr ::= expr IS NULL */
-{yylhsminor.yy328 = tSqlExprCreate(yymsp[-2].minor.yy328, NULL, TK_ISNULL);}
-  yymsp[-2].minor.yy328 = yylhsminor.yy328;
+      case 240: /* expr ::= expr IS NULL */
+{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, NULL, TK_ISNULL);}
+  yymsp[-2].minor.yy68 = yylhsminor.yy68;
         break;
-      case 238: /* expr ::= expr IS NOT NULL */
-{yylhsminor.yy328 = tSqlExprCreate(yymsp[-3].minor.yy328, NULL, TK_NOTNULL);}
-  yymsp[-3].minor.yy328 = yylhsminor.yy328;
+      case 241: /* expr ::= expr IS NOT NULL */
+{yylhsminor.yy68 = tSqlExprCreate(yymsp[-3].minor.yy68, NULL, TK_NOTNULL);}
+  yymsp[-3].minor.yy68 = yylhsminor.yy68;
         break;
-      case 239: /* expr ::= expr LT expr */
-{yylhsminor.yy328 = tSqlExprCreate(yymsp[-2].minor.yy328, yymsp[0].minor.yy328, TK_LT);}
-  yymsp[-2].minor.yy328 = yylhsminor.yy328;
+      case 242: /* expr ::= expr LT expr */
+{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_LT);}
+  yymsp[-2].minor.yy68 = yylhsminor.yy68;
         break;
-      case 240: /* expr ::= expr GT expr */
-{yylhsminor.yy328 = tSqlExprCreate(yymsp[-2].minor.yy328, yymsp[0].minor.yy328, TK_GT);}
-  yymsp[-2].minor.yy328 = yylhsminor.yy328;
+      case 243: /* expr ::= expr GT expr */
+{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_GT);}
+  yymsp[-2].minor.yy68 = yylhsminor.yy68;
         break;
-      case 241: /* expr ::= expr LE expr */
-{yylhsminor.yy328 = tSqlExprCreate(yymsp[-2].minor.yy328, yymsp[0].minor.yy328, TK_LE);}
-  yymsp[-2].minor.yy328 = yylhsminor.yy328;
+      case 244: /* expr ::= expr LE expr */
+{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_LE);}
+  yymsp[-2].minor.yy68 = yylhsminor.yy68;
         break;
-      case 242: /* expr ::= expr GE expr */
-{yylhsminor.yy328 = tSqlExprCreate(yymsp[-2].minor.yy328, yymsp[0].minor.yy328, TK_GE);}
-  yymsp[-2].minor.yy328 = yylhsminor.yy328;
+      case 245: /* expr ::= expr GE expr */
+{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_GE);}
+  yymsp[-2].minor.yy68 = yylhsminor.yy68;
         break;
-      case 243: /* expr ::= expr NE expr */
-{yylhsminor.yy328 = tSqlExprCreate(yymsp[-2].minor.yy328, yymsp[0].minor.yy328, TK_NE);}
-  yymsp[-2].minor.yy328 = yylhsminor.yy328;
+      case 246: /* expr ::= expr NE expr */
+{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_NE);}
+  yymsp[-2].minor.yy68 = yylhsminor.yy68;
         break;
-      case 244: /* expr ::= expr EQ expr */
-{yylhsminor.yy328 = tSqlExprCreate(yymsp[-2].minor.yy328, yymsp[0].minor.yy328, TK_EQ);}
-  yymsp[-2].minor.yy328 = yylhsminor.yy328;
+      case 247: /* expr ::= expr EQ expr */
+{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_EQ);}
+  yymsp[-2].minor.yy68 = yylhsminor.yy68;
         break;
-      case 245: /* expr ::= expr BETWEEN expr AND expr */
-{ tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy328); yylhsminor.yy328 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy328, yymsp[-2].minor.yy328, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy328, TK_LE), TK_AND);}
-  yymsp[-4].minor.yy328 = yylhsminor.yy328;
+      case 248: /* expr ::= expr BETWEEN expr AND expr */
+{ tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy68); yylhsminor.yy68 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy68, yymsp[-2].minor.yy68, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy68, TK_LE), TK_AND);}
+  yymsp[-4].minor.yy68 = yylhsminor.yy68;
         break;
-      case 246: /* expr ::= expr AND expr */
-{yylhsminor.yy328 = tSqlExprCreate(yymsp[-2].minor.yy328, yymsp[0].minor.yy328, TK_AND);}
-  yymsp[-2].minor.yy328 = yylhsminor.yy328;
+      case 249: /* expr ::= expr AND expr */
+{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_AND);}
+  yymsp[-2].minor.yy68 = yylhsminor.yy68;
         break;
-      case 247: /* expr ::= expr OR expr */
-{yylhsminor.yy328 = tSqlExprCreate(yymsp[-2].minor.yy328, yymsp[0].minor.yy328, TK_OR); }
-  yymsp[-2].minor.yy328 = yylhsminor.yy328;
+      case 250: /* expr ::= expr OR expr */
+{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_OR); }
+  yymsp[-2].minor.yy68 = yylhsminor.yy68;
         break;
-      case 248: /* expr ::= expr PLUS expr */
-{yylhsminor.yy328 = tSqlExprCreate(yymsp[-2].minor.yy328, yymsp[0].minor.yy328, TK_PLUS);  }
-  yymsp[-2].minor.yy328 = yylhsminor.yy328;
+      case 251: /* expr ::= expr PLUS expr */
+{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_PLUS);  }
+  yymsp[-2].minor.yy68 = yylhsminor.yy68;
         break;
-      case 249: /* expr ::= expr MINUS expr */
-{yylhsminor.yy328 = tSqlExprCreate(yymsp[-2].minor.yy328, yymsp[0].minor.yy328, TK_MINUS); }
-  yymsp[-2].minor.yy328 = yylhsminor.yy328;
+      case 252: /* expr ::= expr MINUS expr */
+{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_MINUS); }
+  yymsp[-2].minor.yy68 = yylhsminor.yy68;
         break;
-      case 250: /* expr ::= expr STAR expr */
-{yylhsminor.yy328 = tSqlExprCreate(yymsp[-2].minor.yy328, yymsp[0].minor.yy328, TK_STAR);  }
-  yymsp[-2].minor.yy328 = yylhsminor.yy328;
+      case 253: /* expr ::= expr STAR expr */
+{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_STAR);  }
+  yymsp[-2].minor.yy68 = yylhsminor.yy68;
         break;
-      case 251: /* expr ::= expr SLASH expr */
-{yylhsminor.yy328 = tSqlExprCreate(yymsp[-2].minor.yy328, yymsp[0].minor.yy328, TK_DIVIDE);}
-  yymsp[-2].minor.yy328 = yylhsminor.yy328;
+      case 254: /* expr ::= expr SLASH expr */
+{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_DIVIDE);}
+  yymsp[-2].minor.yy68 = yylhsminor.yy68;
         break;
-      case 252: /* expr ::= expr REM expr */
-{yylhsminor.yy328 = tSqlExprCreate(yymsp[-2].minor.yy328, yymsp[0].minor.yy328, TK_REM);   }
-  yymsp[-2].minor.yy328 = yylhsminor.yy328;
+      case 255: /* expr ::= expr REM expr */
+{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_REM);   }
+  yymsp[-2].minor.yy68 = yylhsminor.yy68;
         break;
-      case 253: /* expr ::= expr LIKE expr */
-{yylhsminor.yy328 = tSqlExprCreate(yymsp[-2].minor.yy328, yymsp[0].minor.yy328, TK_LIKE);  }
-  yymsp[-2].minor.yy328 = yylhsminor.yy328;
+      case 256: /* expr ::= expr LIKE expr */
+{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_LIKE);  }
+  yymsp[-2].minor.yy68 = yylhsminor.yy68;
         break;
-      case 254: /* expr ::= expr IN LP exprlist RP */
-{yylhsminor.yy328 = tSqlExprCreate(yymsp[-4].minor.yy328, (tSqlExpr*)yymsp[-1].minor.yy15, TK_IN); }
-  yymsp[-4].minor.yy328 = yylhsminor.yy328;
+      case 257: /* expr ::= expr IN LP exprlist RP */
+{yylhsminor.yy68 = tSqlExprCreate(yymsp[-4].minor.yy68, (tSqlExpr*)yymsp[-1].minor.yy93, TK_IN); }
+  yymsp[-4].minor.yy68 = yylhsminor.yy68;
         break;
-      case 255: /* exprlist ::= exprlist COMMA expritem */
-{yylhsminor.yy15 = tSqlExprListAppend(yymsp[-2].minor.yy15,yymsp[0].minor.yy328,0, 0);}
-  yymsp[-2].minor.yy15 = yylhsminor.yy15;
+      case 258: /* exprlist ::= exprlist COMMA expritem */
+{yylhsminor.yy93 = tSqlExprListAppend(yymsp[-2].minor.yy93,yymsp[0].minor.yy68,0, 0);}
+  yymsp[-2].minor.yy93 = yylhsminor.yy93;
         break;
-      case 256: /* exprlist ::= expritem */
-{yylhsminor.yy15 = tSqlExprListAppend(0,yymsp[0].minor.yy328,0, 0);}
-  yymsp[0].minor.yy15 = yylhsminor.yy15;
+      case 259: /* exprlist ::= expritem */
+{yylhsminor.yy93 = tSqlExprListAppend(0,yymsp[0].minor.yy68,0, 0);}
+  yymsp[0].minor.yy93 = yylhsminor.yy93;
         break;
-      case 257: /* expritem ::= expr */
-{yylhsminor.yy328 = yymsp[0].minor.yy328;}
-  yymsp[0].minor.yy328 = yylhsminor.yy328;
+      case 260: /* expritem ::= expr */
+{yylhsminor.yy68 = yymsp[0].minor.yy68;}
+  yymsp[0].minor.yy68 = yylhsminor.yy68;
         break;
-      case 259: /* cmd ::= RESET QUERY CACHE */
+      case 262: /* cmd ::= RESET QUERY CACHE */
 { setDCLSqlElems(pInfo, TSDB_SQL_RESET_CACHE, 0);}
         break;
-      case 260: /* cmd ::= SYNCDB ids REPLICA */
+      case 263: /* cmd ::= SYNCDB ids REPLICA */
 { setDCLSqlElems(pInfo, TSDB_SQL_SYNC_DB_REPLICA, 1, &yymsp[-1].minor.yy0);}
         break;
-      case 261: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
+      case 264: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
 {
     yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
-    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy15, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1);
+    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy93, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
         break;
-      case 262: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
+      case 265: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
 {
     yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
 
@@ -3067,21 +3080,21 @@ static void yy_reduce(
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
         break;
-      case 263: /* cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */
+      case 266: /* cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */
 {
     yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
-    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy15, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, -1);
+    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy93, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, -1);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
         break;
-      case 264: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
+      case 267: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
 {
     yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
-    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy15, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1);
+    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy93, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
         break;
-      case 265: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
+      case 268: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
 {
     yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
 
@@ -3092,7 +3105,7 @@ static void yy_reduce(
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
         break;
-      case 266: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
+      case 269: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
 {
     yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n;
 
@@ -3106,33 +3119,33 @@ static void yy_reduce(
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
         break;
-      case 267: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
+      case 270: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
 {
     yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n;
 
     toTSDBType(yymsp[-2].minor.yy0.type);
     SArray* A = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1);
-    A = tVariantListAppend(A, &yymsp[0].minor.yy380, -1);
+    A = tVariantListAppend(A, &yymsp[0].minor.yy518, -1);
 
     SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, -1);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
         break;
-      case 268: /* cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */
+      case 271: /* cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */
 {
     yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
-    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy15, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, -1);
+    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy93, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, -1);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
         break;
-      case 269: /* cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
+      case 272: /* cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
 {
     yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
-    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy15, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE);
+    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy93, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
         break;
-      case 270: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
+      case 273: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
 {
     yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
 
@@ -3143,21 +3156,21 @@ static void yy_reduce(
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
         break;
-      case 271: /* cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */
+      case 274: /* cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */
 {
     yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
-    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy15, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, TSDB_SUPER_TABLE);
+    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy93, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, TSDB_SUPER_TABLE);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
         break;
-      case 272: /* cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
+      case 275: /* cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
 {
     yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
-    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy15, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE);
+    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy93, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
         break;
-      case 273: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
+      case 276: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
 {
     yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
 
@@ -3168,7 +3181,7 @@ static void yy_reduce(
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
         break;
-      case 274: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
+      case 277: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
 {
     yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n;
 
@@ -3182,32 +3195,32 @@ static void yy_reduce(
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
         break;
-      case 275: /* cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */
+      case 278: /* cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */
 {
     yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n;
 
     toTSDBType(yymsp[-2].minor.yy0.type);
     SArray* A = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1);
-    A = tVariantListAppend(A, &yymsp[0].minor.yy380, -1);
+    A = tVariantListAppend(A, &yymsp[0].minor.yy518, -1);
 
     SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, TSDB_SUPER_TABLE);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
         break;
-      case 276: /* cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */
+      case 279: /* cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */
 {
     yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
-    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy15, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, TSDB_SUPER_TABLE);
+    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy93, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, TSDB_SUPER_TABLE);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
         break;
-      case 277: /* cmd ::= KILL CONNECTION INTEGER */
+      case 280: /* cmd ::= KILL CONNECTION INTEGER */
 {setKillSql(pInfo, TSDB_SQL_KILL_CONNECTION, &yymsp[0].minor.yy0);}
         break;
-      case 278: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */
+      case 281: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */
 {yymsp[-2].minor.yy0.n += (yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSql(pInfo, TSDB_SQL_KILL_STREAM, &yymsp[-2].minor.yy0);}
         break;
-      case 279: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */
+      case 282: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */
 {yymsp[-2].minor.yy0.n += (yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSql(pInfo, TSDB_SQL_KILL_QUERY, &yymsp[-2].minor.yy0);}
         break;
       default:
diff --git a/src/tsdb/inc/tsdbint.h b/src/tsdb/inc/tsdbint.h
index 7cf88826319b0b4ad8a7d128b19264d2b67434d0..dd43e393102c40d4b12a948a9b4d6d72f30f6dad 100644
--- a/src/tsdb/inc/tsdbint.h
+++ b/src/tsdb/inc/tsdbint.h
@@ -92,6 +92,7 @@ struct STsdbRepo {
   pthread_mutex_t mutex;
   bool            repoLocked;
   int32_t         code;  // Commit code
+  bool            inCompact;  // is in compact process?
 };
 
 #define REPO_ID(r) (r)->config.tsdbId
diff --git a/src/tsdb/src/tsdbCompact.c b/src/tsdb/src/tsdbCompact.c
index 635bba388a6063868ca002859044d0845cb5c163..c98e9175b8639bd135c34ca0fadda7afa53e4f36 100644
--- a/src/tsdb/src/tsdbCompact.c
+++ b/src/tsdb/src/tsdbCompact.c
@@ -12,11 +12,512 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-#include "tsdb.h"
+#include "tsdbint.h"
 
-#ifndef _TSDB_PLUGINS
+typedef struct {
+  STable *    pTable;
+  SBlockIdx * pBlkIdx;
+  SBlockIdx   bindex;
+  SBlockInfo *pInfo;
+} STableCompactH;
 
-int   tsdbCompact(STsdbRepo *pRepo) { return 0; }
-void *tsdbCompactImpl(STsdbRepo *pRepo) { return NULL; }
+typedef struct {
+  SRtn       rtn;
+  SFSIter    fsIter;
+  SArray *   tbArray;  // table array to cache table obj and block indexes
+  SReadH     readh;
+  SDFileSet  wSet;
+  SArray *   aBlkIdx;
+  SArray *   aSupBlk;
+  SDataCols *pDataCols;
+} SCompactH;
 
-#endif
\ No newline at end of file
+#define TSDB_COMPACT_WSET(pComph) (&((pComph)->wSet))
+#define TSDB_COMPACT_REPO(pComph) TSDB_READ_REPO(&((pComph)->readh))
+#define TSDB_COMPACT_HEAD_FILE(pComph) TSDB_DFILE_IN_SET(TSDB_COMPACT_WSET(pComph), TSDB_FILE_HEAD)
+#define TSDB_COMPACT_DATA_FILE(pComph) TSDB_DFILE_IN_SET(TSDB_COMPACT_WSET(pComph), TSDB_FILE_DATA)
+#define TSDB_COMPACT_LAST_FILE(pComph) TSDB_DFILE_IN_SET(TSDB_COMPACT_WSET(pComph), TSDB_FILE_LAST)
+#define TSDB_COMPACT_BUF(pComph) TSDB_READ_BUF(&((pComph)->readh))
+#define TSDB_COMPACT_COMP_BUF(pComph) TSDB_READ_COMP_BUF(&((pComph)->readh))
+
+static int  tsdbAsyncCompact(STsdbRepo *pRepo);
+static void tsdbStartCompact(STsdbRepo *pRepo);
+static void tsdbEndCompact(STsdbRepo *pRepo, int eno);
+static int  tsdbCompactMeta(STsdbRepo *pRepo);
+static int  tsdbCompactTSData(STsdbRepo *pRepo);
+static int  tsdbCompactFSet(SCompactH *pComph, SDFileSet *pSet);
+static bool tsdbShouldCompact(SCompactH *pComph);
+static int  tsdbInitCompactH(SCompactH *pComph, STsdbRepo *pRepo);
+static void tsdbDestroyCompactH(SCompactH *pComph);
+static int  tsdbInitCompTbArray(SCompactH *pComph);
+static void tsdbDestroyCompTbArray(SCompactH *pComph);
+static int  tsdbCacheFSetIndex(SCompactH *pComph);
+static int  tsdbCompactFSetInit(SCompactH *pComph, SDFileSet *pSet);
+static void tsdbCompactFSetEnd(SCompactH *pComph);
+static int  tsdbCompactFSetImpl(SCompactH *pComph);
+static int  tsdbWriteBlockToRightFile(SCompactH *pComph, STable *pTable, SDataCols *pDataCols, void **ppBuf,
+                                      void **ppCBuf);
+
+int tsdbCompact(STsdbRepo *pRepo) { return tsdbAsyncCompact(pRepo); }
+
+void *tsdbCompactImpl(STsdbRepo *pRepo) {
+  // Check if there are files in TSDB FS to compact
+  if (REPO_FS(pRepo)->cstatus->pmf == NULL) {
+    tsdbInfo("vgId:%d no file to compact in FS", REPO_ID(pRepo));
+    return NULL;
+  }
+
+  tsdbStartCompact(pRepo);
+
+  if (tsdbCompactMeta(pRepo) < 0) {
+    tsdbError("vgId:%d failed to compact META data since %s", REPO_ID(pRepo), tstrerror(terrno));
+    goto _err;
+  }
+
+  if (tsdbCompactTSData(pRepo) < 0) {
+    tsdbError("vgId:%d failed to compact TS data since %s", REPO_ID(pRepo), tstrerror(terrno));
+    goto _err;
+  }
+
+  tsdbEndCompact(pRepo, TSDB_CODE_SUCCESS);
+  return NULL;
+
+_err:
+  pRepo->code = terrno;
+  tsdbEndCompact(pRepo, terrno);
+  return NULL;
+}
+
+static int tsdbAsyncCompact(STsdbRepo *pRepo) {
+  tsem_wait(&(pRepo->readyToCommit));
+  return tsdbScheduleCommit(pRepo, COMPACT_REQ);
+}
+
+static void tsdbStartCompact(STsdbRepo *pRepo) {
+  ASSERT(!pRepo->inCompact);
+  tsdbInfo("vgId:%d start to compact!", REPO_ID(pRepo));
+  tsdbStartFSTxn(pRepo, 0, 0);
+  pRepo->code = TSDB_CODE_SUCCESS;
+  pRepo->inCompact = true;
+}
+
+static void tsdbEndCompact(STsdbRepo *pRepo, int eno) {
+  if (eno != TSDB_CODE_SUCCESS) {
+    tsdbEndFSTxnWithError(REPO_FS(pRepo));
+  } else {
+    tsdbEndFSTxn(pRepo);
+  }
+  pRepo->inCompact = false;
+  tsdbInfo("vgId:%d compact over, %s", REPO_ID(pRepo), (eno == TSDB_CODE_SUCCESS) ? "succeed" : "failed");
+  tsem_post(&(pRepo->readyToCommit));
+}
+
+static int tsdbCompactMeta(STsdbRepo *pRepo) {
+  STsdbFS *pfs = REPO_FS(pRepo);
+  tsdbUpdateMFile(pfs, pfs->cstatus->pmf);
+  return 0;
+}
+
+static int tsdbCompactTSData(STsdbRepo *pRepo) {
+  SCompactH  compactH;
+  SDFileSet *pSet = NULL;
+
+  tsdbDebug("vgId:%d start to compact TS data", REPO_ID(pRepo));
+
+  // If no file, just return 0;
+  if (taosArrayGetSize(REPO_FS(pRepo)->cstatus->df) <= 0) {
+    tsdbDebug("vgId:%d no TS data file to compact, compact over", REPO_ID(pRepo));
+    return 0;
+  }
+
+  if (tsdbInitCompactH(&compactH, pRepo) < 0) {
+    return -1;
+  }
+
+  while ((pSet = tsdbFSIterNext(&(compactH.fsIter)))) {
+    // Remove those expired files
+    if (pSet->fid < compactH.rtn.minFid) {
+      tsdbInfo("vgId:%d FSET %d on level %d disk id %d expires, remove it", REPO_ID(pRepo), pSet->fid,
+               TSDB_FSET_LEVEL(pSet), TSDB_FSET_ID(pSet));
+      continue;
+    }
+
+    if (TSDB_FSET_LEVEL(pSet) == TFS_MAX_LEVEL) {
+      tsdbDebug("vgId:%d FSET %d on level %d, should not compact", REPO_ID(pRepo), pSet->fid, TFS_MAX_LEVEL);
+      tsdbUpdateDFileSet(REPO_FS(pRepo), pSet);
+      continue;
+    }
+
+    if (tsdbCompactFSet(&compactH, pSet) < 0) {
+      tsdbDestroyCompactH(&compactH);
+      tsdbError("vgId:%d failed to compact FSET %d since %s", REPO_ID(pRepo), pSet->fid, tstrerror(terrno));
+      return -1;
+    }
+  }
+
+  tsdbDestroyCompactH(&compactH);
+  tsdbDebug("vgId:%d compact TS data over", REPO_ID(pRepo));
+  return 0;
+}
+
+static int tsdbCompactFSet(SCompactH *pComph, SDFileSet *pSet) {
+  STsdbRepo *pRepo = TSDB_COMPACT_REPO(pComph);
+  SDiskID    did;
+
+  tsdbDebug("vgId:%d start to compact FSET %d on level %d id %d", REPO_ID(pRepo), pSet->fid, TSDB_FSET_LEVEL(pSet),
+            TSDB_FSET_ID(pSet));
+
+  if (tsdbCompactFSetInit(pComph, pSet) < 0) {
+    return -1;
+  }
+
+  if (!tsdbShouldCompact(pComph)) {
+    tsdbDebug("vgId:%d no need to compact FSET %d", REPO_ID(pRepo), pSet->fid);
+    if (tsdbApplyRtnOnFSet(TSDB_COMPACT_REPO(pComph), pSet, &(pComph->rtn)) < 0) {
+      tsdbCompactFSetEnd(pComph);
+      return -1;
+    }
+  } else {
+    // Create new fset as compacted fset
+    tfsAllocDisk(tsdbGetFidLevel(pSet->fid, &(pComph->rtn)), &(did.level), &(did.id));
+    if (did.level == TFS_UNDECIDED_LEVEL) {
+      terrno = TSDB_CODE_TDB_NO_AVAIL_DISK;
+      tsdbError("vgId:%d failed to compact FSET %d since %s", REPO_ID(pRepo), pSet->fid, tstrerror(terrno));
+      tsdbCompactFSetEnd(pComph);
+      return -1;
+    }
+
+    tsdbInitDFileSet(TSDB_COMPACT_WSET(pComph), did, REPO_ID(pRepo), TSDB_FSET_FID(pSet),
+                     FS_TXN_VERSION(REPO_FS(pRepo)));
+    if (tsdbCreateDFileSet(TSDB_COMPACT_WSET(pComph), true) < 0) {
+      tsdbError("vgId:%d failed to compact FSET %d since %s", REPO_ID(pRepo), pSet->fid, tstrerror(terrno));
+      tsdbCompactFSetEnd(pComph);
+      return -1;
+    }
+
+    if (tsdbCompactFSetImpl(pComph) < 0) {
+      tsdbCloseDFileSet(TSDB_COMPACT_WSET(pComph));
+      tsdbRemoveDFileSet(TSDB_COMPACT_WSET(pComph));
+      tsdbCompactFSetEnd(pComph);
+      return -1;
+    }
+
+    tsdbCloseDFileSet(TSDB_COMPACT_WSET(pComph));
+    tsdbUpdateDFileSet(REPO_FS(pRepo), TSDB_COMPACT_WSET(pComph));
+    tsdbDebug("vgId:%d FSET %d compact over", REPO_ID(pRepo), pSet->fid);
+  }
+
+  tsdbCompactFSetEnd(pComph);
+  return 0;
+}
+
+static bool tsdbShouldCompact(SCompactH *pComph) {
+  STsdbRepo *     pRepo = TSDB_COMPACT_REPO(pComph);
+  STsdbCfg *      pCfg = REPO_CFG(pRepo);
+  SReadH *        pReadh = &(pComph->readh);
+  STableCompactH *pTh;
+  SBlock *        pBlock;
+  int             defaultRows = TSDB_DEFAULT_BLOCK_ROWS(pCfg->maxRowsPerFileBlock);
+  SDFile *        pDataF = TSDB_READ_DATA_FILE(pReadh);
+  SDFile *        pLastF = TSDB_READ_LAST_FILE(pReadh);
+
+  int     tblocks = 0;       // total blocks
+  int     nSubBlocks = 0;    // # of blocks with sub-blocks
+  int     nSmallBlocks = 0;  // # of blocks with rows < defaultRows
+  int64_t tsize = 0;
+
+  for (size_t i = 0; i < taosArrayGetSize(pComph->tbArray); i++) {
+    pTh = (STableCompactH *)taosArrayGet(pComph->tbArray, i);
+
+    if (pTh->pTable == NULL || pTh->pBlkIdx == NULL) continue;
+
+    for (size_t bidx = 0; bidx < pTh->pBlkIdx->numOfBlocks; bidx++) {
+      tblocks++;
+      pBlock = pTh->pInfo->blocks + bidx;
+
+      if (pBlock->numOfRows < defaultRows) {
+        nSmallBlocks++;
+      }
+
+      if (pBlock->numOfSubBlocks > 1) {
+        nSubBlocks++;
+        for (int k = 0; k < pBlock->numOfSubBlocks; k++) {
+          SBlock *iBlock = ((SBlock *)POINTER_SHIFT(pTh->pInfo, pBlock->offset)) + k;
+          tsize = tsize + iBlock->len;
+        }
+      } else if (pBlock->numOfSubBlocks == 1) {
+        tsize += pBlock->len;
+      } else {
+        ASSERT(0);
+      }
+    }
+  }
+
+  return (((nSubBlocks * 1.0 / tblocks) > 0.33) || ((nSmallBlocks * 1.0 / tblocks) > 0.33) ||
+          (tsize * 1.0 / (pDataF->info.size + pLastF->info.size - 2 * TSDB_FILE_HEAD_SIZE) < 0.85));
+}
+
+static int tsdbInitCompactH(SCompactH *pComph, STsdbRepo *pRepo) {
+  STsdbCfg *pCfg = REPO_CFG(pRepo);
+
+  memset(pComph, 0, sizeof(*pComph));
+
+  TSDB_FSET_SET_CLOSED(TSDB_COMPACT_WSET(pComph));
+
+  tsdbGetRtnSnap(pRepo, &(pComph->rtn));
+  tsdbFSIterInit(&(pComph->fsIter), REPO_FS(pRepo), TSDB_FS_ITER_FORWARD);
+
+  if (tsdbInitReadH(&(pComph->readh), pRepo) < 0) {
+    return -1;
+  }
+
+  if (tsdbInitCompTbArray(pComph) < 0) {
+    tsdbDestroyCompactH(pComph);
+    return -1;
+  }
+
+  pComph->aBlkIdx = taosArrayInit(1024, sizeof(SBlockIdx));
+  if (pComph->aBlkIdx == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    tsdbDestroyCompactH(pComph);
+    return -1;
+  }
+
+  pComph->aSupBlk = taosArrayInit(1024, sizeof(SBlock));
+  if (pComph->aSupBlk == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    tsdbDestroyCompactH(pComph);
+    return -1;
+  }
+
+  pComph->pDataCols = tdNewDataCols(0, 0, pCfg->maxRowsPerFileBlock);
+  if (pComph->pDataCols == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    tsdbDestroyCompactH(pComph);
+    return -1;
+  }
+
+  return 0;
+}
+
+static void tsdbDestroyCompactH(SCompactH *pComph) {
+  pComph->pDataCols = tdFreeDataCols(pComph->pDataCols);
+  pComph->aSupBlk = taosArrayDestroy(pComph->aSupBlk);
+  pComph->aBlkIdx = taosArrayDestroy(pComph->aBlkIdx);
+  tsdbDestroyCompTbArray(pComph);
+  tsdbDestroyReadH(&(pComph->readh));
+  tsdbCloseDFileSet(TSDB_COMPACT_WSET(pComph));
+}
+
+static int tsdbInitCompTbArray(SCompactH *pComph) {  // Init pComp->tbArray
+  STsdbRepo *pRepo = TSDB_COMPACT_REPO(pComph);
+  STsdbMeta *pMeta = pRepo->tsdbMeta;
+
+  if (tsdbRLockRepoMeta(pRepo) < 0) return -1;
+
+  pComph->tbArray = taosArrayInit(pMeta->maxTables, sizeof(STableCompactH));
+  if (pComph->tbArray == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    tsdbUnlockRepoMeta(pRepo);
+    return -1;
+  }
+
+  // Note here must start from 0
+  for (int i = 0; i < pMeta->maxTables; i++) {
+    STableCompactH ch = {0};
+    if (pMeta->tables[i] != NULL) {
+      tsdbRefTable(pMeta->tables[i]);
+      ch.pTable = pMeta->tables[i];
+    }
+
+    if (taosArrayPush(pComph->tbArray, &ch) == NULL) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      tsdbUnlockRepoMeta(pRepo);
+      return -1;
+    }
+  }
+
+  if (tsdbUnlockRepoMeta(pRepo) < 0) return -1;
+  return 0;
+}
+
+static void tsdbDestroyCompTbArray(SCompactH *pComph) {
+  STableCompactH *pTh;
+
+  if (pComph->tbArray == NULL) return;
+
+  for (size_t i = 0; i < taosArrayGetSize(pComph->tbArray); i++) {
+    pTh = (STableCompactH *)taosArrayGet(pComph->tbArray, i);
+    if (pTh->pTable) {
+      tsdbUnRefTable(pTh->pTable);
+    }
+
+    pTh->pInfo = taosTZfree(pTh->pInfo);
+  }
+
+  pComph->tbArray = taosArrayDestroy(pComph->tbArray);
+}
+
+static int tsdbCacheFSetIndex(SCompactH *pComph) {
+  SReadH *pReadH = &(pComph->readh);
+
+  if (tsdbLoadBlockIdx(pReadH) < 0) {
+    return -1;
+  }
+
+  for (int tid = 1; tid < taosArrayGetSize(pComph->tbArray); tid++) {
+    STableCompactH *pTh = (STableCompactH *)taosArrayGet(pComph->tbArray, tid);
+    pTh->pBlkIdx = NULL;
+
+    if (pTh->pTable == NULL) continue;
+    if (tsdbSetReadTable(pReadH, pTh->pTable) < 0) {
+      return -1;
+    }
+
+    if (pReadH->pBlkIdx == NULL) continue;
+    pTh->bindex = *(pReadH->pBlkIdx);
+    pTh->pBlkIdx = &(pTh->bindex);
+
+    if (tsdbMakeRoom((void **)(&(pTh->pInfo)), pTh->pBlkIdx->len) < 0) {
+      return -1;
+    }
+
+    if (tsdbLoadBlockInfo(pReadH, (void *)(pTh->pInfo)) < 0) {
+      return -1;
+    }
+  }
+
+  return 0;
+}
+
+static int tsdbCompactFSetInit(SCompactH *pComph, SDFileSet *pSet) {
+  taosArrayClear(pComph->aBlkIdx);
+  taosArrayClear(pComph->aSupBlk);
+
+  if (tsdbSetAndOpenReadFSet(&(pComph->readh), pSet) < 0) {
+    return -1;
+  }
+
+  if (tsdbCacheFSetIndex(pComph) < 0) {
+    tsdbCloseAndUnsetFSet(&(pComph->readh));
+    return -1;
+  }
+
+  return 0;
+}
+
+static void tsdbCompactFSetEnd(SCompactH *pComph) { tsdbCloseAndUnsetFSet(&(pComph->readh)); }
+
+static int tsdbCompactFSetImpl(SCompactH *pComph) {
+  STsdbRepo *pRepo = TSDB_COMPACT_REPO(pComph);
+  STsdbCfg * pCfg = REPO_CFG(pRepo);
+  SReadH *   pReadh = &(pComph->readh);
+  SBlockIdx  blkIdx;
+  void **    ppBuf = &(TSDB_COMPACT_BUF(pComph));
+  void **    ppCBuf = &(TSDB_COMPACT_COMP_BUF(pComph));
+  int        defaultRows = TSDB_DEFAULT_BLOCK_ROWS(pCfg->maxRowsPerFileBlock);
+
+  taosArrayClear(pComph->aBlkIdx);
+
+  for (int tid = 1; tid < taosArrayGetSize(pComph->tbArray); tid++) {
+    STableCompactH *pTh = (STableCompactH *)taosArrayGet(pComph->tbArray, tid);
+    STSchema *      pSchema;
+
+    if (pTh->pTable == NULL || pTh->pBlkIdx == NULL) continue;
+
+    pSchema = tsdbGetTableSchemaImpl(pTh->pTable, true, true, -1);
+    taosArrayClear(pComph->aSupBlk);
+    if ((tdInitDataCols(pComph->pDataCols, pSchema) < 0) || (tdInitDataCols(pReadh->pDCols[0], pSchema) < 0) ||
+        (tdInitDataCols(pReadh->pDCols[1], pSchema) < 0)) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      return -1;
+    }
+    tdFreeSchema(pSchema);
+
+    // Loop to compact each block data
+    for (int i = 0; i < pTh->pBlkIdx->numOfBlocks; i++) {
+      SBlock *pBlock = pTh->pInfo->blocks + i;
+
+      // Load the block data
+      if (tsdbLoadBlockData(pReadh, pBlock, pTh->pInfo) < 0) {
+        return -1;
+      }
+
+      // Merge pComph->pDataCols and pReadh->pDCols[0] and write data to file
+      if (pComph->pDataCols->numOfRows == 0 && pBlock->numOfRows >= defaultRows) {
+        if (tsdbWriteBlockToRightFile(pComph, pTh->pTable, pReadh->pDCols[0], ppBuf, ppCBuf) < 0) {
+          return -1;
+        }
+      } else {
+        int ridx = 0;
+
+        while (true) {
+          if (pReadh->pDCols[0]->numOfRows - ridx == 0) break;
+          int rowsToMerge = MIN(pReadh->pDCols[0]->numOfRows - ridx, defaultRows - pComph->pDataCols->numOfRows);
+
+          tdMergeDataCols(pComph->pDataCols, pReadh->pDCols[0], rowsToMerge, &ridx);
+
+          if (pComph->pDataCols->numOfRows < defaultRows) {
+            break;
+          }
+
+          if (tsdbWriteBlockToRightFile(pComph, pTh->pTable, pComph->pDataCols, ppBuf, ppCBuf) < 0) {
+            return -1;
+          }
+          tdResetDataCols(pComph->pDataCols);
+        }
+      }
+    }
+
+    if (pComph->pDataCols->numOfRows > 0 &&
+        tsdbWriteBlockToRightFile(pComph, pTh->pTable, pComph->pDataCols, ppBuf, ppCBuf) < 0) {
+      return -1;
+    }
+
+    if (tsdbWriteBlockInfoImpl(TSDB_COMPACT_HEAD_FILE(pComph), pTh->pTable, pComph->aSupBlk, NULL, ppBuf, &blkIdx) <
+        0) {
+      return -1;
+    }
+
+    if ((blkIdx.numOfBlocks > 0) && (taosArrayPush(pComph->aBlkIdx, (void *)(&blkIdx)) == NULL)) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      return -1;
+    }
+  }
+
+  if (tsdbWriteBlockIdx(TSDB_COMPACT_HEAD_FILE(pComph), pComph->aBlkIdx, ppBuf) < 0) {
+    return -1;
+  }
+
+  return 0;
+}
+
+static int tsdbWriteBlockToRightFile(SCompactH *pComph, STable *pTable, SDataCols *pDataCols, void **ppBuf,
+                                     void **ppCBuf) {
+  STsdbRepo *pRepo = TSDB_COMPACT_REPO(pComph);
+  STsdbCfg * pCfg = REPO_CFG(pRepo);
+  SDFile *   pDFile;
+  bool       isLast;
+  SBlock     block;
+
+  ASSERT(pDataCols->numOfRows > 0);
+
+  if (pDataCols->numOfRows < pCfg->minRowsPerFileBlock) {
+    pDFile = TSDB_COMPACT_LAST_FILE(pComph);
+    isLast = true;
+  } else {
+    pDFile = TSDB_COMPACT_DATA_FILE(pComph);
+    isLast = false;
+  }
+
+  if (tsdbWriteBlockImpl(pRepo, pTable, pDFile, pDataCols, &block, isLast, true, ppBuf, ppCBuf) < 0) {
+    return -1;
+  }
+
+  if (taosArrayPush(pComph->aSupBlk, (void *)(&block)) == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  return 0;
+}
diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c
index bb02e0128337dbd0436e3c8b83894097b1c21c4c..0cbabb8909814bc15e949f224cab4e21e2427660 100644
--- a/src/tsdb/src/tsdbMain.c
+++ b/src/tsdb/src/tsdbMain.c
@@ -195,6 +195,8 @@ STsdbRepoInfo *tsdbGetStatus(STsdbRepo *pRepo) { return NULL; }
 
 int tsdbGetState(STsdbRepo *repo) { return repo->state; }
 
+bool tsdbInCompact(STsdbRepo *repo) { return repo->inCompact; }
+
 void tsdbReportStat(void *repo, int64_t *totalPoints, int64_t *totalStorage, int64_t *compStorage) {
   ASSERT(repo != NULL);
   STsdbRepo *pRepo = repo;
@@ -533,6 +535,7 @@ static STsdbRepo *tsdbNewRepo(STsdbCfg *pCfg, STsdbAppH *pAppH) {
 
   pRepo->state = TSDB_STATE_OK;
   pRepo->code = TSDB_CODE_SUCCESS;
+  pRepo->inCompact = false;
   pRepo->config = *pCfg;
   if (pAppH) {
     pRepo->appH = *pAppH;
diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c
index 3ba02616ee13a1e3177d0875704f555f0b82834f..972c3c4e10c163c4c5b66d3390200b97f207e0a0 100644
--- a/src/tsdb/src/tsdbRead.c
+++ b/src/tsdb/src/tsdbRead.c
@@ -218,11 +218,6 @@ static void tsdbMayUnTakeMemSnapshot(STsdbQueryHandle* pQueryHandle) {
 int64_t tsdbGetNumOfRowsInMemTable(TsdbQueryHandleT* pHandle) {
   STsdbQueryHandle* pQueryHandle = (STsdbQueryHandle*) pHandle;
 
-  size_t size = taosArrayGetSize(pQueryHandle->pTableCheckInfo);
-  assert(pQueryHandle->activeIndex < size && pQueryHandle->activeIndex >= 0 && size >= 1);
-  STableCheckInfo* pCheckInfo = taosArrayGet(pQueryHandle->pTableCheckInfo, pQueryHandle->activeIndex);
-  
-
   int64_t rows = 0;
   SMemRef* pMemRef = pQueryHandle->pMemRef;
   if (pMemRef == NULL) { return rows; }
@@ -233,15 +228,19 @@ int64_t tsdbGetNumOfRowsInMemTable(TsdbQueryHandleT* pHandle) {
   SMemTable* pMemT = pMemRef->snapshot.mem;
   SMemTable* pIMemT = pMemRef->snapshot.imem;
 
-  if (pMemT && pCheckInfo->tableId.tid < pMemT->maxTables) {
-    pMem = pMemT->tData[pCheckInfo->tableId.tid];
-    rows += (pMem && pMem->uid == pCheckInfo->tableId.uid) ? pMem->numOfRows: 0; 
-  }
-  if (pIMemT && pCheckInfo->tableId.tid < pIMemT->maxTables) {
-    pIMem = pIMemT->tData[pCheckInfo->tableId.tid];
-    rows += (pIMem && pIMem->uid == pCheckInfo->tableId.uid) ? pIMem->numOfRows: 0; 
+  size_t size = taosArrayGetSize(pQueryHandle->pTableCheckInfo);
+  for (int32_t i = 0; i < size; ++i) {
+    STableCheckInfo* pCheckInfo = taosArrayGet(pQueryHandle->pTableCheckInfo, i);
+
+    if (pMemT && pCheckInfo->tableId.tid < pMemT->maxTables) {
+      pMem = pMemT->tData[pCheckInfo->tableId.tid];
+      rows += (pMem && pMem->uid == pCheckInfo->tableId.uid) ? pMem->numOfRows : 0;
+    }
+    if (pIMemT && pCheckInfo->tableId.tid < pIMemT->maxTables) {
+      pIMem = pIMemT->tData[pCheckInfo->tableId.tid];
+      rows += (pIMem && pIMem->uid == pCheckInfo->tableId.uid) ? pIMem->numOfRows : 0;
+    }
   }
-  
   return rows;
 }
 
@@ -3573,6 +3572,9 @@ int32_t tsdbGetTableGroupFromIdList(STsdbRepo* tsdb, SArray* pTableIdList, STabl
     if (pTable->type == TSDB_SUPER_TABLE) {
       tsdbError("direct query on super tale is not allowed, table uid:%"PRIu64", tid:%d", id->uid, id->tid);
       terrno = TSDB_CODE_QRY_INVALID_MSG;
+      tsdbUnlockRepoMeta(tsdb);
+      taosArrayDestroy(group);
+      return terrno;
     }
 
     tsdbRefTable(pTable);
diff --git a/src/util/inc/hash.h b/src/util/inc/hash.h
index cd4850e47e855cde4c1a7c281edb0afc23404370..c37426069cf64bb35ac5e1100d49e8103c851625 100644
--- a/src/util/inc/hash.h
+++ b/src/util/inc/hash.h
@@ -61,6 +61,7 @@ typedef struct SHashObj {
   size_t          size;         // number of elements in hash table
   _hash_fn_t      hashFp;       // hash function
   _hash_free_fn_t freeFp;       // hash node free callback function
+  _equal_fn_t     equalFp;       // equal function
 
   SRWLatch        lock;         // read-write spin lock
   SHashLockTypeE  type;         // lock type
@@ -78,6 +79,15 @@ typedef struct SHashObj {
  */
 SHashObj *taosHashInit(size_t capacity, _hash_fn_t fn, bool update, SHashLockTypeE type);
 
+
+/**
+ * set equal func of the hash table  
+ * @param pHashObj    
+ * @param equalFp       
+ * @return
+ */
+void taosHashSetEqualFp(SHashObj *pHashObj, _equal_fn_t fp);
+
 /**
  * return the size of hash table
  * @param pHashObj
diff --git a/src/util/inc/hashfunc.h b/src/util/inc/hashfunc.h
index 047f1889d78d6f8559bd0e320a0e9bae2beaa681..a9563d03941496a42e71a91fc7b7aab014ff4f50 100644
--- a/src/util/inc/hashfunc.h
+++ b/src/util/inc/hashfunc.h
@@ -20,6 +20,8 @@
 
 typedef uint32_t (*_hash_fn_t)(const char *, uint32_t);
 
+typedef int32_t (*_equal_fn_t)(const void *a, const void *b, size_t sz); 
+
 /**
  * murmur hash algorithm
  * @key  usually string
@@ -36,9 +38,14 @@ uint32_t MurmurHash3_32(const char *key, uint32_t len);
  * @return
  */
 uint32_t taosIntHash_32(const char *key, uint32_t len);
-
 uint32_t taosIntHash_64(const char *key, uint32_t len);
 
+
+int32_t  taosFloatEqual(const void *a, const void *b, size_t sz);
+int32_t  taosDoubleEqual(const void *a,const void *b, size_t sz); 
+
 _hash_fn_t taosGetDefaultHashFunction(int32_t type);
 
+_equal_fn_t taosGetDefaultEqualFunction(int32_t type);
+
 #endif //TDENGINE_HASHUTIL_H
diff --git a/src/util/inc/tcompare.h b/src/util/inc/tcompare.h
index 5e951923c1513a4e90b8d9cccea15cbeb5664ee5..612ce7ede0976764843a16002c7770cfa2a6bbb7 100644
--- a/src/util/inc/tcompare.h
+++ b/src/util/inc/tcompare.h
@@ -27,6 +27,13 @@ extern "C" {
 #define TSDB_PATTERN_NOWILDCARDMATCH 2
 #define TSDB_PATTERN_STRING_MAX_LEN 20
 
+#define FLT_COMPAR_TOL_FACTOR    4
+#define FLT_EQUAL(_x, _y)        (fabs((_x) - (_y)) <= (FLT_COMPAR_TOL_FACTOR * FLT_EPSILON))
+#define FLT_GREATER(_x, _y)      (!FLT_EQUAL((_x), (_y)) && ((_x) > (_y)))
+#define FLT_LESS(_x, _y)         (!FLT_EQUAL((_x), (_y)) && ((_x) < (_y)))
+#define FLT_GREATEREQUAL(_x, _y) (FLT_EQUAL((_x), (_y)) || ((_x) > (_y)))
+#define FLT_LESSEQUAL(_x, _y)    (FLT_EQUAL((_x), (_y)) || ((_x) < (_y)))
+
 #define PATTERN_COMPARE_INFO_INITIALIZER { '%', '_' }
 
 typedef struct SPatternCompareInfo {
diff --git a/src/util/inc/tutil.h b/src/util/inc/tutil.h
index fe5c038c5169d88814c7807d550ebadaba8ebacd..7c8fd2ed8353a086ec9f145aaaa30f4db57113cb 100644
--- a/src/util/inc/tutil.h
+++ b/src/util/inc/tutil.h
@@ -26,6 +26,7 @@ extern "C" {
 #include "taosdef.h"
 
 int32_t strdequote(char *src);
+int32_t strRmquote(char *z, int32_t len);
 size_t  strtrim(char *src);
 char *  strnchr(char *haystack, char needle, int32_t len, bool skipquote);
 char ** strsplit(char *src, const char *delim, int32_t *num);
diff --git a/src/util/src/hash.c b/src/util/src/hash.c
index ede3e1e4ce3d1c9e5cadbd6bc21c009f0c5f5ca3..5b3218382fff38382a536c8ece077fd2f350adf2 100644
--- a/src/util/src/hash.c
+++ b/src/util/src/hash.c
@@ -73,10 +73,10 @@ static FORCE_INLINE int32_t taosHashCapacity(int32_t length) {
   return i;
 }
 
-static FORCE_INLINE SHashNode *doSearchInEntryList(SHashEntry *pe, const void *key, size_t keyLen, uint32_t hashVal) {
+static FORCE_INLINE SHashNode *doSearchInEntryList(SHashObj *pHashObj, SHashEntry *pe, const void *key, size_t keyLen, uint32_t hashVal) {
   SHashNode *pNode = pe->next;
   while (pNode) {
-    if ((pNode->keyLen == keyLen) && (memcmp(GET_HASH_NODE_KEY(pNode), key, keyLen) == 0) && pNode->removed == 0) {
+    if ((pNode->keyLen == keyLen) && ((*(pHashObj->equalFp))(GET_HASH_NODE_KEY(pNode), key, keyLen) == 0) && pNode->removed == 0) {
       assert(pNode->hashVal == hashVal);
       break;
     }
@@ -165,8 +165,8 @@ SHashObj *taosHashInit(size_t capacity, _hash_fn_t fn, bool update, SHashLockTyp
   // the max slots is not defined by user
   pHashObj->capacity = taosHashCapacity((int32_t)capacity);
   assert((pHashObj->capacity & (pHashObj->capacity - 1)) == 0);
-
-  pHashObj->hashFp = fn;
+  pHashObj->equalFp = memcmp;
+  pHashObj->hashFp  = fn;
   pHashObj->type = type;
   pHashObj->enableUpdate = update;
 
@@ -189,6 +189,12 @@ SHashObj *taosHashInit(size_t capacity, _hash_fn_t fn, bool update, SHashLockTyp
   return pHashObj;
 }
 
+void taosHashSetEqualFp(SHashObj *pHashObj, _equal_fn_t fp) {
+  if (pHashObj != NULL && fp != NULL) {
+    pHashObj->equalFp = fp;
+  } 
+} 
+
 int32_t taosHashGetSize(const SHashObj *pHashObj) { return (int32_t)((pHashObj == NULL) ? 0 : pHashObj->size); }
 
 int32_t taosHashPut(SHashObj *pHashObj, const void *key, size_t keyLen, void *data, size_t size) {
@@ -223,7 +229,7 @@ int32_t taosHashPut(SHashObj *pHashObj, const void *key, size_t keyLen, void *da
 
   SHashNode* prev = NULL;
   while (pNode) {
-    if ((pNode->keyLen == keyLen) && (memcmp(GET_HASH_NODE_KEY(pNode), key, keyLen) == 0) && pNode->removed == 0) {
+    if ((pNode->keyLen == keyLen) && ((*(pHashObj->equalFp))(GET_HASH_NODE_KEY(pNode), key, keyLen) == 0) && pNode->removed == 0) {
       assert(pNode->hashVal == hashVal);
       break;
     }
@@ -306,7 +312,7 @@ void* taosHashGetClone(SHashObj *pHashObj, const void *key, size_t keyLen, void
     assert(pe->next == NULL);
   }
 
-  SHashNode *pNode = doSearchInEntryList(pe, key, keyLen, hashVal);
+  SHashNode *pNode = doSearchInEntryList(pHashObj, pe, key, keyLen, hashVal);
   if (pNode != NULL) {
     if (fp != NULL) {
       fp(GET_HASH_NODE_DATA(pNode));
@@ -362,7 +368,7 @@ int32_t taosHashRemoveWithData(SHashObj *pHashObj, const void *key, size_t keyLe
   SHashNode *prevNode = NULL;
 
   while (pNode) {
-    if ((pNode->keyLen == keyLen) && (memcmp(GET_HASH_NODE_KEY(pNode), key, keyLen) == 0) && pNode->removed == 0) 
+    if ((pNode->keyLen == keyLen) && ((*(pHashObj->equalFp))(GET_HASH_NODE_KEY(pNode), key, keyLen) == 0) && pNode->removed == 0) 
       break;
 
     prevNode = pNode;
diff --git a/src/util/src/tcompare.c b/src/util/src/tcompare.c
index f91d13e6d0a4310181594b840631249bd1bcade8..e953f4c4649b6f906b8517a7165600d246da2176 100644
--- a/src/util/src/tcompare.c
+++ b/src/util/src/tcompare.c
@@ -90,13 +90,10 @@ int32_t compareFloatVal(const void *pLeft, const void *pRight) {
   if (isnan(p2)) {
     return 1;
   }
-
-  float ret = p1 - p2;
-  if (fabs(ret) < FLT_EPSILON) {
+  if (FLT_EQUAL(p1, p2)) {
     return 0;
-  } else {
-    return ret > 0? 1 : -1;
-  }
+  } 
+  return FLT_GREATER(p1, p2) ? 1: -1; 
 }
 
 int32_t compareDoubleVal(const void *pLeft, const void *pRight) {
@@ -114,13 +111,10 @@ int32_t compareDoubleVal(const void *pLeft, const void *pRight) {
   if (isnan(p2)) {
     return 1;
   }
-
-  double ret = p1 - p2;
-  if (fabs(ret) < FLT_EPSILON) {
+  if (FLT_EQUAL(p1, p2)) {
     return 0;
-  } else {
-    return ret > 0? 1 : -1;
-  }
+  } 
+  return FLT_GREATER(p1, p2) ? 1: -1; 
 }
 
 int32_t compareLenPrefixedStr(const void *pLeft, const void *pRight) {
diff --git a/src/util/src/terror.c b/src/util/src/terror.c
index 382f872486485d93420d7f180dc11414f570132c..1d37a6e9a4b740d2cfabb18bd3d2252fa6bfd034 100644
--- a/src/util/src/terror.c
+++ b/src/util/src/terror.c
@@ -193,7 +193,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_MND_DB_IN_DROPPING,           "Database not availabl
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_VGROUP_NOT_READY,         "Database unsynced")
 
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_DB_OPTION_DAYS,   "Invalid database option: days out of range")
-TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_DB_OPTION_KEEP,   "Invalid database option: keep >= keep1 >= keep0 >= days")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_DB_OPTION_KEEP,   "Invalid database option: keep2 >= keep1 >= keep0 >= days")
 
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_TOPIC,            "Invalid topic name")
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_TOPIC_OPTION,     "Invalid topic option")
diff --git a/src/util/src/thashutil.c b/src/util/src/thashutil.c
index 3634dca4c0f635b61b9a26e3f96c6f00bc9bb34d..ffe167977ba3fd08ac75f0b142c4fcb7db1d14a2 100644
--- a/src/util/src/thashutil.c
+++ b/src/util/src/thashutil.c
@@ -16,17 +16,20 @@
 #include "os.h"
 #include "hashfunc.h"
 #include "tutil.h"
+#include "tcompare.h"
 
 #define ROTL32(x, r) ((x) << (r) | (x) >> (32u - (r)))
 
+#define DLT (FLT_COMPAR_TOL_FACTOR * FLT_EPSILON)
+#define BASE 1000
+
 #define FMIX32(h)      \
   do {                 \
     (h) ^= (h) >> 16;  \
     (h) *= 0x85ebca6b; \
     (h) ^= (h) >> 13;  \
     (h) *= 0xc2b2ae35; \
-    (h) ^= (h) >> 16;  \
-  } while (0)
+    (h) ^= (h) >> 16; } while (0)
   
 uint32_t MurmurHash3_32(const char *key, uint32_t len) {
   const uint8_t *data = (const uint8_t *)key;
@@ -78,7 +81,38 @@ uint32_t MurmurHash3_32(const char *key, uint32_t len) {
 uint32_t taosIntHash_32(const char *key, uint32_t UNUSED_PARAM(len)) { return *(uint32_t *)key; }
 uint32_t taosIntHash_16(const char *key, uint32_t UNUSED_PARAM(len)) { return *(uint16_t *)key; }
 uint32_t taosIntHash_8(const char *key, uint32_t UNUSED_PARAM(len)) { return *(uint8_t *)key; }
+uint32_t taosFloatHash(const char *key, uint32_t UNUSED_PARAM(len)) {
+  float f = GET_FLOAT_VAL(key); 
+  if (isnan(f)) {
+    return 0x7fc00000;
+  }
+   
+  if (FLT_EQUAL(f, 0.0)) {
+    return 0;
+  } 
+  if (fabs(f) < FLT_MAX/BASE - DLT) {
+   int t = (int)(round(BASE * (f + DLT)));
+   return (uint32_t)t;
+  } else {
+   return 0x7fc00000;
+  }
+}
+uint32_t taosDoubleHash(const char *key, uint32_t UNUSED_PARAM(len)) {
+  double f = GET_DOUBLE_VAL(key);  
+  if (isnan(f)) {
+    return 0x7fc00000;
+  }
 
+  if (FLT_EQUAL(f, 0.0)) {
+    return 0;
+  } 
+  if (fabs(f) < DBL_MAX/BASE - DLT) {
+   int t = (int)(round(BASE * (f + DLT)));
+   return (uint32_t)t;
+  } else {
+   return 0x7fc00000;
+  } 
+}
 uint32_t taosIntHash_64(const char *key, uint32_t UNUSED_PARAM(len)) {
   uint64_t val = *(uint64_t *)key;
 
@@ -92,13 +126,35 @@ _hash_fn_t taosGetDefaultHashFunction(int32_t type) {
   _hash_fn_t fn = NULL;
   switch(type) {
     case TSDB_DATA_TYPE_TIMESTAMP:
-    case TSDB_DATA_TYPE_BIGINT: fn = taosIntHash_64;break;
-    case TSDB_DATA_TYPE_BINARY: fn = MurmurHash3_32;break;
-    case TSDB_DATA_TYPE_INT: fn = taosIntHash_32; break;
+    case TSDB_DATA_TYPE_BIGINT:   fn = taosIntHash_64;break;
+    case TSDB_DATA_TYPE_BINARY:   fn = MurmurHash3_32;break;
+    case TSDB_DATA_TYPE_NCHAR:    fn = MurmurHash3_32;break;
+    case TSDB_DATA_TYPE_INT:      fn = taosIntHash_32; break;
     case TSDB_DATA_TYPE_SMALLINT: fn = taosIntHash_16; break;
-    case TSDB_DATA_TYPE_TINYINT: fn = taosIntHash_8; break;
+    case TSDB_DATA_TYPE_TINYINT:  fn = taosIntHash_8; break;
+    case TSDB_DATA_TYPE_FLOAT:    fn = taosFloatHash; break;                             
+    case TSDB_DATA_TYPE_DOUBLE:   fn = taosDoubleHash; break;                             
     default: fn = taosIntHash_32;break;
   }
   
   return fn;
-}
\ No newline at end of file
+}
+
+int32_t taosFloatEqual(const void *a, const void *b, size_t UNUSED_PARAM(sz)) {
+  return getComparFunc(TSDB_DATA_TYPE_FLOAT, -1)(a, b);  
+}
+
+int32_t taosDoubleEqual(const void *a, const void *b, size_t UNUSED_PARAM(sz)) {
+  return getComparFunc(TSDB_DATA_TYPE_DOUBLE, -1)(a, b);  
+}
+
+_equal_fn_t taosGetDefaultEqualFunction(int32_t type) {
+  _equal_fn_t fn = NULL;
+  switch (type) {
+    case TSDB_DATA_TYPE_FLOAT:  fn = taosFloatEqual;  break; 
+    case TSDB_DATA_TYPE_DOUBLE: fn = taosDoubleEqual; break;
+    default: fn = memcmp; break;
+  }
+  return fn;
+  
+}
diff --git a/src/util/src/ttokenizer.c b/src/util/src/ttokenizer.c
index 7026fcda0f156c9edc6fb17dd192aae88e3042a3..62389f191fe5d48933f040d4dca136204a1b9f51 100644
--- a/src/util/src/ttokenizer.c
+++ b/src/util/src/ttokenizer.c
@@ -265,6 +265,10 @@ static int32_t tKeywordCode(const char* z, int n) {
     }
   }
 
+  if (keywordHashTable == NULL) {
+    return TK_ILLEGAL;
+  }
+  
   SKeyword** pKey = (SKeyword**)taosHashGet(keywordHashTable, key, n);
   return (pKey != NULL)? (*pKey)->type:TK_ID;
 }
@@ -494,9 +498,9 @@ uint32_t tGetToken(char* z, uint32_t* tokenId) {
       }
 
       /* here is the 1u/1a/2s/3m/9y */
-      if ((z[i] == 'u' || z[i] == 'a' || z[i] == 's' || z[i] == 'm' || z[i] == 'h' || z[i] == 'd' || z[i] == 'n' ||
+      if ((z[i] == 'b' || z[i] == 'u' || z[i] == 'a' || z[i] == 's' || z[i] == 'm' || z[i] == 'h' || z[i] == 'd' || z[i] == 'n' ||
            z[i] == 'y' || z[i] == 'w' ||
-           z[i] == 'U' || z[i] == 'A' || z[i] == 'S' || z[i] == 'M' || z[i] == 'H' || z[i] == 'D' || z[i] == 'N' ||
+           z[i] == 'B' || z[i] == 'U' || z[i] == 'A' || z[i] == 'S' || z[i] == 'M' || z[i] == 'H' || z[i] == 'D' || z[i] == 'N' ||
            z[i] == 'Y' || z[i] == 'W') &&
           (isIdChar[(uint8_t)z[i + 1]] == 0)) {
         *tokenId = TK_VARIABLE;
diff --git a/src/util/src/tutil.c b/src/util/src/tutil.c
index 451976f563740b4ac933766d5c0c8f4075ad42d8..bda52936f90d07b1fde598de9ca683c8a1b8b82a 100644
--- a/src/util/src/tutil.c
+++ b/src/util/src/tutil.c
@@ -52,6 +52,36 @@ int32_t strdequote(char *z) {
   return j + 1;  // only one quote, do nothing
 }
 
+
+int32_t strRmquote(char *z, int32_t len){  
+    // delete escape character: \\, \', \"
+    char delim = z[0];
+    if (delim != '\'' && delim != '\"') {
+      return len;
+    }
+  
+    int32_t cnt = 0;
+    int32_t j = 0;
+    for (uint32_t k = 1; k < len - 1; ++k) {
+      if (z[k] == '\\' || (z[k] == delim && z[k + 1] == delim)) {
+          z[j] = z[k + 1];
+  
+        cnt++;
+        j++;
+        k++;
+        continue;
+      }
+  
+      z[j] = z[k];
+      j++;
+    }
+  
+    z[j] = 0;
+    
+    return len - 2 - cnt;
+}
+
+
 size_t strtrim(char *z) {
   int32_t i = 0;
   int32_t j = 0;
diff --git a/src/wal/src/walWrite.c b/src/wal/src/walWrite.c
index b884546a08674fef7c2c42f104c5200e0d5efff8..47749987994a3af3234b0149d00f5b89c75700ff 100644
--- a/src/wal/src/walWrite.c
+++ b/src/wal/src/walWrite.c
@@ -346,7 +346,7 @@ static int32_t walRestoreWalFile(SWal *pWal, void *pVnode, FWalWrite writeFp, ch
     }
 
 #if defined(WAL_CHECKSUM_WHOLE)
-    if (pHead->sver == 0 && !walValidateChecksum(pHead)) {
+    if ((pHead->sver == 0 && !walValidateChecksum(pHead)) || pHead->sver < 0 || pHead->sver > 1) {
       wError("vgId:%d, file:%s, wal head cksum is messed up, hver:%" PRIu64 " len:%d offset:%" PRId64, pWal->vgId, name,
              pHead->version, pHead->len, offset);
       code = walSkipCorruptedRecord(pWal, pHead, tfd, &offset);
diff --git a/tests/comparisonTest/opentsdb/opentsdbtest/pom.xml b/tests/comparisonTest/opentsdb/opentsdbtest/pom.xml
index 29c2a90f1080f81abe54597aded28e9530e14859..e0ada8b763eca8208260ebde73ce8fb192e917db 100644
--- a/tests/comparisonTest/opentsdb/opentsdbtest/pom.xml
+++ b/tests/comparisonTest/opentsdb/opentsdbtest/pom.xml
@@ -216,13 +216,13 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-core</artifactId>
-      <version>1.0.13</version>
+      <version>1.2.0</version>
     </dependency>
 
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.0.13</version>
+      <version>1.2.0</version>
     </dependency>
 
     <dependency>
diff --git a/tests/examples/c/apitest.c b/tests/examples/c/apitest.c
index 44d9d0cee6b8971f8208ae55798ef5e07b50a2ca..0f24df0f4767fe1cdace072425768473ffcaa88f 100644
--- a/tests/examples/c/apitest.c
+++ b/tests/examples/c/apitest.c
@@ -86,7 +86,7 @@ static int print_result(TAOS_RES* res, int blockFetch) {
     }
   } else {
     while ((row = taos_fetch_row(res))) {
-      char temp[256];
+      char temp[256] = {0};
       taos_print_row(temp, row, fields, num_fields);
       puts(temp);
       nRows++;
@@ -391,10 +391,10 @@ void verify_prepare(TAOS* taos) {
   int         rows = 0;
   int         num_fields = taos_num_fields(result);
   TAOS_FIELD *fields = taos_fetch_fields(result);
-  char        temp[256];
 
   // fetch the records row by row
   while ((row = taos_fetch_row(result))) {
+    char temp[256] = {0};
     rows++;
     taos_print_row(temp, row, fields, num_fields);
     printf("%s\n", temp);
@@ -614,10 +614,10 @@ void verify_prepare2(TAOS* taos) {
   int         rows = 0;
   int         num_fields = taos_num_fields(result);
   TAOS_FIELD *fields = taos_fetch_fields(result);
-  char        temp[256];
 
   // fetch the records row by row
   while ((row = taos_fetch_row(result))) {
+    char temp[256] = {0};
     rows++;
     taos_print_row(temp, row, fields, num_fields);
     printf("%s\n", temp);
@@ -866,12 +866,10 @@ void verify_prepare3(TAOS* taos) {
   int         rows = 0;
   int         num_fields = taos_num_fields(result);
   TAOS_FIELD *fields = taos_fetch_fields(result);
-  char        temp[256] = {0};
 
   // fetch the records row by row
   while ((row = taos_fetch_row(result))) {
-    memset(temp, 0, sizeof(temp)/sizeof(temp[0]));
-
+    char temp[256] = {0};
     rows++;
     taos_print_row(temp, row, fields, num_fields);
     printf("%s\n", temp);
diff --git a/tests/examples/c/demo.c b/tests/examples/c/demo.c
index 0b1cd7b5d2d304a89656c98e88b2a620e16ae5a1..f8c69d0043591afa8f5e32e80bd35e9413e60e76 100644
--- a/tests/examples/c/demo.c
+++ b/tests/examples/c/demo.c
@@ -116,12 +116,12 @@ void Test(TAOS *taos, char *qstr, int index)  {
   int         rows = 0;
   int         num_fields = taos_field_count(result);
   TAOS_FIELD *fields = taos_fetch_fields(result);
-  char        temp[1024];
 
   printf("num_fields = %d\n", num_fields);
   printf("select * from table, result:\n");
   // fetch the records row by row
   while ((row = taos_fetch_row(result))) {
+    char temp[1024] = {0};
     rows++;
     taos_print_row(temp, row, fields, num_fields);
     printf("%s\n", temp);
diff --git a/tests/examples/c/prepare.c b/tests/examples/c/prepare.c
index 13d71beea6156aa32677c20ccc2d222d28826b24..723b340a923c0bf326599e8090f8c6142a249053 100644
--- a/tests/examples/c/prepare.c
+++ b/tests/examples/c/prepare.c
@@ -184,10 +184,10 @@ int main(int argc, char *argv[])
   int         rows = 0;
   int         num_fields = taos_num_fields(result);
   TAOS_FIELD *fields = taos_fetch_fields(result);
-  char        temp[256];
 
   // fetch the records row by row
   while ((row = taos_fetch_row(result))) {
+    char temp[256] = {0};
     rows++;
     taos_print_row(temp, row, fields, num_fields);
     printf("%s\n", temp);
diff --git a/tests/examples/c/subscribe.c b/tests/examples/c/subscribe.c
index 1d3533fa5ee89f7425a9b0563e738b4e0703e6c8..ad12f0e7a55b0f471f249f92f30cf659c94586a5 100644
--- a/tests/examples/c/subscribe.c
+++ b/tests/examples/c/subscribe.c
@@ -14,8 +14,6 @@ void print_result(TAOS_RES* res, int blockFetch) {
   int         num_fields = taos_num_fields(res);
   TAOS_FIELD* fields = taos_fetch_fields(res);
   int         nRows = 0;
-  char        buf[4096];
-
   
   if (blockFetch) {
     nRows = taos_fetch_block(res, &row);
@@ -25,6 +23,7 @@ void print_result(TAOS_RES* res, int blockFetch) {
     //}
   } else {
     while ((row = taos_fetch_row(res))) {
+      char buf[4096] = {0};
       taos_print_row(buf, row, fields, num_fields);
       puts(buf);
       nRows++;
diff --git a/tests/mas/Jenkinsfile b/tests/mas/Jenkinsfile
index 0e6e94a037d3ba1a187e6bdad2070e9dc4d4a32f..ae2286298f3e7de4e831451ccdeaef28a5d71a8e 100644
--- a/tests/mas/Jenkinsfile
+++ b/tests/mas/Jenkinsfile
@@ -21,7 +21,7 @@ def pre_test(){
     cmake .. > /dev/null
     make > /dev/null
     make install > /dev/null
-    pip3 install ${WKC}/src/connector/python/linux/python3/
+    pip3 install ${WKC}/src/connector/python/ || echo 0
     '''
     return 1
 }
diff --git a/tests/pytest/alter/alter_create_exception.py b/tests/pytest/alter/alter_create_exception.py
new file mode 100644
index 0000000000000000000000000000000000000000..19f1ba9464617fe120740ec26a411a216cfd9a48
--- /dev/null
+++ b/tests/pytest/alter/alter_create_exception.py
@@ -0,0 +1,91 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+#TODO: after TD-4518 and TD-4510 is resolved, add the exception test case for these situations
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        #checking string input exception for alter
+        tdSql.error("alter database db keep '10'")
+        tdSql.error('alter database db keep "10"')
+        tdSql.error("alter database db keep '\t'")
+        tdSql.error("alter database db keep \'\t\'")
+        tdSql.error('alter database db keep "a"')
+        tdSql.error('alter database db keep "1.4"')
+        tdSql.error("alter database db blocks '10'")
+        tdSql.error('alter database db comp "0"')
+        tdSql.execute('drop database if exists db')
+
+        #checking string input exception for create
+        tdSql.error("create database db comp '0'")
+        tdSql.error('create database db comp "1"')
+        tdSql.error("create database db comp '\t'")
+        tdSql.error("alter database db keep \'\t\'")
+        tdSql.error('create database db comp "a"')
+        tdSql.error('create database db comp "1.4"')
+        tdSql.error("create database db blocks '10'")
+        tdSql.error('create database db keep "3650"')
+        tdSql.error('create database db fsync "3650"')
+        tdSql.execute('create database db precision "us"')
+        tdSql.query('show databases')
+        tdSql.checkData(0,16,'us')
+        tdSql.execute('drop database if exists db')
+
+        #checking float input exception for create
+        tdSql.error("create database db fsync 7.3")
+        tdSql.error("create database db fsync 0.0")
+        tdSql.error("create database db fsync -5.32")
+        tdSql.error('create database db comp 7.2')
+        tdSql.error("create database db blocks 5.87")
+        tdSql.error('create database db keep 15.4')
+
+        #checking float input exception for insert
+        tdSql.execute('create database db')
+        tdSql.error('alter database db blocks 5.9')
+        tdSql.error('alter database db blocks -4.7')
+        tdSql.error('alter database db blocks 0.0')
+        tdSql.error('alter database db keep 15.4')
+        tdSql.error('alter database db comp 2.67')
+
+        #checking additional exception param for alter keep
+        tdSql.error('alter database db keep 365001')
+        tdSql.error('alter database db keep 364999,365000,365001')
+        tdSql.error('alter database db keep -10')
+        tdSql.error('alter database db keep 5')
+        tdSql.error('alter database db keep ')
+        tdSql.error('alter database db keep 40,a,60')
+        tdSql.error('alter database db keep ,,60,')
+        tdSql.error('alter database db keep \t')
+        tdSql.execute('alter database db keep \t50')
+        tdSql.query('show databases')
+        tdSql.checkData(0,7,'50,50,50')
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file
diff --git a/tests/pytest/alter/alter_keep.py b/tests/pytest/alter/alter_keep.py
index cb630963a7c26a531857f9a39ff715f83c14280d..9f66b08823d4a137dd16a323e43463d7d6189c6a 100644
--- a/tests/pytest/alter/alter_keep.py
+++ b/tests/pytest/alter/alter_keep.py
@@ -23,84 +23,98 @@ class TDTestCase:
         tdSql.init(conn.cursor(), logSql)
     
     def alterKeepCommunity(self):
-        ## community accepts both 1 paramater, 2 parmaters and 3 paramaters
-        ## but paramaters other than paramater 1 will be ignored 
-        ## only paramater 1 will be used
+        tdLog.notice('running Keep Test, Community Version')
+        tdLog.notice('running parameter test for keep during create')
+        #testing keep parameter during create
         tdSql.query('show databases')
-        tdSql.checkData(0,7,'3650,3650,3650')
+        tdSql.checkData(0,7,'3650')
+        tdSql.execute('drop database db')
 
-        tdSql.execute('alter database db keep 10')
+        tdSql.execute('create database db keep 100')
         tdSql.query('show databases')
-        tdSql.checkData(0,7,'10,10,10')
+        tdSql.checkData(0,7,'100')
+        tdSql.execute('drop database db')
 
-        tdSql.execute('alter database db keep 50')
-        tdSql.query('show databases')
-        tdSql.checkData(0,7,'50,50,50')
+        tdSql.error('create database db keep ')
+        tdSql.error('create database db keep 0')
+        tdSql.error('create database db keep 10,20')
+        tdSql.error('create database db keep 10,20,30')
+        tdSql.error('create database db keep 20,30,40,50')
 
-        tdSql.execute('alter database db keep 20')
-        tdSql.query('show databases')
-        tdSql.checkData(0,7,'20,20,20')
+        #testing keep parameter during alter
+        tdSql.execute('create database db')
+        tdLog.notice('running parameter test for keep during alter')
 
-        tdSql.execute('alter database db keep 100, 98 ,99')
+        tdSql.execute('alter database db keep 100')
         tdSql.query('show databases')
-        tdSql.checkData(0,7,'100,100,100')
+        tdSql.checkData(0,7,'100')
 
-        tdSql.execute('alter database db keep 99, 100 ,101')
+        tdSql.error('alter database db keep ')
+        tdSql.error('alter database db keep 0')
+        tdSql.error('alter database db keep 10,20')
+        tdSql.error('alter database db keep 10,20,30')
+        tdSql.error('alter database db keep 20,30,40,50')
         tdSql.query('show databases')
-        tdSql.checkData(0,7,'99,99,99')
+        tdSql.checkData(0,7,'100')
 
-        tdSql.execute('alter database db keep 200, 199 ,198')
-        tdSql.query('show databases')
-        tdSql.checkData(0,7,'200,200,200')
+    def alterKeepEnterprise(self):
+        tdLog.notice('running Keep Test, Enterprise Version')
+        #testing keep parameter during create
+        tdLog.notice('running parameter test for keep during create')
 
-        tdSql.execute('alter database db keep 4000,4001')
         tdSql.query('show databases')
-        tdSql.checkData(0,7,'4000,4000,4000')
+        tdSql.checkData(0,7,'3650,3650,3650')
+        tdSql.execute('drop database db')
 
-        tdSql.execute('alter database db keep 5000,50')
+        tdSql.execute('create database db keep 100')
         tdSql.query('show databases')
-        tdSql.checkData(0,7,'5000,5000,5000')
+        tdSql.checkData(0,7,'100,100,100')
+        tdSql.execute('drop database db')
 
-        tdSql.execute('alter database db keep 50,5000')
+        tdSql.execute('create database db keep 20, 30')
         tdSql.query('show databases')
-        tdSql.checkData(0,7,'50,50,50')
+        tdSql.checkData(0,7,'20,30,30')
+        tdSql.execute('drop database db')
 
-
-    def alterKeepEnterprise(self):
-        ## enterprise only accept three inputs
-        ## does not accept 1 paramaters nor 3 paramaters
+        tdSql.execute('create database db keep 30,40,50')
         tdSql.query('show databases')
-        tdSql.checkData(0,7,'3650,3650,3650')
+        tdSql.checkData(0,7,'30,40,50')
+        tdSql.execute('drop database db')
 
-        tdSql.error('alter database db keep 10')
-        tdSql.query('show databases')
-        tdSql.checkData(0,7,'3650,3650,3650')
+        tdSql.error('create database db keep ')
+        tdSql.error('create database db keep 20,30,40,50')
+        tdSql.error('create database db keep 0')
+        tdSql.error('create database db keep 100,50')
+        tdSql.error('create database db keep 100,40,50')
+        tdSql.error('create database db keep 20,100,50')
+        tdSql.error('create database db keep 50,60,20')
 
-        ## the order for altering keep is keep(D), keep0, keep1.
-        ## if the order is changed, please modify the following test
-        ## to make sure the the test is accurate
+        #testing keep parameter during alter
+        tdSql.execute('create database db')
+        tdLog.notice('running parameter test for keep during alter')
 
-        tdSql.execute('alter database db keep 10, 10 ,10')
+        tdSql.execute('alter database db keep 10')
         tdSql.query('show databases')
         tdSql.checkData(0,7,'10,10,10')
 
-        tdSql.execute('alter database db keep 100, 98 ,99')
+        tdSql.execute('alter database db keep 20,30')
         tdSql.query('show databases')
-        tdSql.checkData(0,7,'98,99,100')
+        tdSql.checkData(0,7,'20,30,30')
 
-        tdSql.execute('alter database db keep 200, 200 ,200')
+        tdSql.execute('alter database db keep 100,200,300')
         tdSql.query('show databases')
-        tdSql.checkData(0,7,'200,200,200')
+        tdSql.checkData(0,7,'100,200,300')
 
-        tdSql.error('alter database db keep 198, 199 ,200')
+        tdSql.error('alter database db keep ')
+        tdSql.error('alter database db keep 20,30,40,50')
+        tdSql.error('alter database db keep 0')
+        tdSql.error('alter database db keep 100,50')
+        tdSql.error('alter database db keep 100,40,50')
+        tdSql.error('alter database db keep 20,100,50')
+        tdSql.error('alter database db keep 50,60,20')
         tdSql.query('show databases')
-        tdSql.checkData(0,7,'200,200,200')
+        tdSql.checkData(0,7,'100,200,300')
 
-        # tdSql.execute('alter database db keep 3650,3650,3650')
-        # tdSql.error('alter database db keep 4000,3640')
-        # tdSql.error('alter database db keep 10,10')
-        # tdSql.query('show databases')
-        # tdSql.checkData(0,7,'3650,3650,3650')
 
     def run(self):
         tdSql.prepare()
@@ -112,29 +126,71 @@ class TDTestCase:
         else:
             tdLog.debug('running community test')
             self.alterKeepCommunity()
-        
+
+        tdSql.prepare()
 
         ##TODO: need to wait for TD-4445 to implement the following
         ##      tests
-        # tdSql.prepare()
-        # tdSql.execute('create table tb (ts timestamp, speed int)')
-        # tdSql.execute('alter database db keep 10,10,10')
-        # tdSql.execute('insert into tb values (now, 10)')
-        # tdSql.execute('insert into tb values (now + 10m, 10)')
-        # tdSql.query('select * from tb')
-        # tdSql.checkRows(2)
-        # tdSql.execute('alter database db keep 40,40,40')
-        # tdSql.query('show databases')
-        # tdSql.checkData(0,7,'40,40,40')
-        # tdSql.error('insert into tb values (now-60d, 10)')
-        # tdSql.execute('insert into tb values (now-30d, 10)')
-        # tdSql.query('select * from tb')
-        # tdSql.checkRows(3)
-        # tdSql.execute('alter database db keep 20,20,20')
-        # tdSql.query('show databases')
-        # tdSql.checkData(0,7,'20,20,20')
-        # tdSql.query('select * from tb')
-        # tdSql.checkRows(2)
+
+
+        ## preset the keep
+        tdSql.prepare()
+
+        tdLog.notice('testing if alter will cause any error')
+        tdSql.execute('create table tb (ts timestamp, speed int)')
+        tdSql.execute('alter database db keep 10,10,10')
+        tdSql.execute('insert into tb values (now, 10)')
+        tdSql.execute('insert into tb values (now + 10m, 10)')
+        tdSql.query('select * from tb')
+        tdSql.checkRows(2)
+
+
+        #after alter from small to large, check if the alter if functioning
+        #test if change through test.py is consistent with change from taos client
+        #test case for TD-4459 and TD-4445
+        tdLog.notice('testing keep will be altered changing from small to big')
+        tdSql.execute('alter database db keep 40,40,40')
+        tdSql.query('show databases')
+        tdSql.checkData(0,7,'40,40,40')
+        tdSql.error('insert into tb values (now-60d, 10)')
+        tdSql.execute('insert into tb values (now-30d, 10)')
+        tdSql.query('select * from tb')
+        tdSql.checkRows(3)
+
+        rowNum = 3
+        for i in range(30):
+            rowNum += 1
+            tdSql.execute('alter database db keep 20,20,20')
+            tdSql.execute('alter database db keep 40,40,40')
+            tdSql.query('show databases')
+            tdSql.checkData(0,7,'40,40,40')
+            tdSql.error('insert into tb values (now-60d, 10)')
+            tdSql.execute('insert into tb values (now-30d, 10)')
+            tdSql.query('select * from tb')
+            tdSql.checkRows(rowNum)
+
+        tdLog.notice('testing keep will be altered changing from big to small')
+        tdSql.execute('alter database db keep 10,10,10')
+        tdSql.query('show databases')
+        tdSql.checkData(0,7,'10,10,10')
+        tdSql.error('insert into tb values (now-15d, 10)')
+        tdSql.query('select * from tb')
+        tdSql.checkRows(rowNum)
+
+        tdLog.notice('testing keep will be altered if sudden change from small to big')
+        tdSql.execute('alter database db keep 14,14,14')
+        tdSql.execute('alter database db keep 15,15,15')
+        tdSql.execute('insert into tb values (now-15d, 10)')
+        tdSql.query('select * from tb')
+        tdSql.checkRows(rowNum + 1)
+
+        tdLog.notice('testing keep will be altered if sudden change from big to small')
+        tdSql.execute('alter database db keep 16,16,16')
+        tdSql.execute('alter database db keep 14,14,14')
+        tdSql.error('insert into tb values (now-15d, 10)')
+        tdSql.query('select * from tb')
+        tdSql.checkRows(rowNum + 1)
+
 
 
     def stop(self):
diff --git a/tests/pytest/alter/alter_keep_exception.py b/tests/pytest/alter/alter_keep_exception.py
deleted file mode 100644
index cddaaa55222785df81aa4c88b75733083d06be72..0000000000000000000000000000000000000000
--- a/tests/pytest/alter/alter_keep_exception.py
+++ /dev/null
@@ -1,44 +0,0 @@
-###################################################################
-#           Copyright (c) 2016 by TAOS Technologies, Inc.
-#                     All rights reserved.
-#
-#  This file is proprietary and confidential to TAOS Technologies.
-#  No part of this file may be reproduced, stored, transmitted,
-#  disclosed or used in any form or by any means other than as
-#  expressly provided by the written permission from Jianhui Tao
-#
-###################################################################
-
-# -*- coding: utf-8 -*-
-
-#TODO: after TD-4518 and TD-4510 is resolved, add the exception test case for these situations
-
-import sys
-from util.log import *
-from util.cases import *
-from util.sql import *
-
-
-class TDTestCase:
-    def init(self, conn, logSql):
-        tdLog.debug("start to execute %s" % __file__)
-        tdSql.init(conn.cursor(), logSql)
-
-    def run(self):
-        tdSql.prepare()
-
-        tdSql.error('alter database keep db 0')
-        tdSql.error('alter database keep db -10')
-        tdSql.error('alter database keep db -2147483648')
-        
-        #this is the test case problem for keep overflow
-        #the error is caught, but type is wrong.
-        #TODO: can be solved in the future, but improvement is minimal
-        tdSql.error('alter database keep db -2147483649')   
-    def stop(self):
-        tdSql.close()
-        tdLog.success("%s successfully executed" % __file__)
-
-
-tdCases.addWindows(__file__, TDTestCase())
-tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file
diff --git a/tests/pytest/client/change_time_1_1.py b/tests/pytest/client/change_time_1_1.py
new file mode 100644
index 0000000000000000000000000000000000000000..24e0195a9c020c793f3e82f45029d8e24199f50b
--- /dev/null
+++ b/tests/pytest/client/change_time_1_1.py
@@ -0,0 +1,72 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.pathFinding import *
+from util.dnodes import tdDnodes
+from datetime import datetime
+import subprocess
+
+##TODO: this is now automatic, but not sure if this will run through jenkins
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        tdFindPath.init(__file__)
+
+    def run(self):
+        tdSql.prepare()
+        binPath = tdFindPath.getTaosdemoPath()
+        TDenginePath = tdFindPath.getTDenginePath()
+
+        ## change system time to 2020/10/20
+        os.system('sudo timedatectl set-ntp off')
+        os.system('sudo timedatectl set-time 2020-10-20')
+
+        #run taosdemo to insert data. one row per second from 2020/10/11 to 2020/10/20
+        #11 data files should be generated
+        #vnode at TDinternal/community/sim/dnode1/data/vnode
+        os.system(f"{binPath}taosdemo -f tools/taosdemoAllTest/manual_change_time_1_1_A.json")  
+        commandArray = ['ls', '-l', f'{TDenginePath}/sim/dnode1/data/vnode/vnode2/tsdb/data']
+        result = subprocess.run(commandArray, stdout=subprocess.PIPE).stdout.decode('utf-8')
+        print(result.count('data'))
+        if result.count('data') != 11:
+            tdLog.exit('wrong number of files')
+        else:
+            tdLog.debug("data file number correct")
+        
+        #move 5 days ahead to 2020/10/25. 4 oldest files should be removed during the new write
+        #leaving 7 data files.
+        os.system ('timedatectl set-time 2020-10-25')
+        os.system(f"{binPath}taosdemo -f tools/taosdemoAllTest/manual_change_time_1_1_B.json") 
+        commandArray = ['ls', '-l', f'{TDenginePath}/sim/dnode1/data/vnode/vnode2/tsdb/data']
+        result = subprocess.run(commandArray, stdout=subprocess.PIPE).stdout.decode('utf-8')
+        print(result.count('data'))
+        if result.count('data') != 7:
+            tdLog.exit('wrong number of files')
+        else:
+            tdLog.debug("data file number correct")
+        tdSql.query('select first(ts) from stb_0')
+        tdSql.checkData(0,0,datetime(2020,10,14,8,0,0,0)) #check the last data in the database
+
+    def stop(self):
+        os.system('sudo timedatectl set-ntp on')
+        tdSql.close()
+        tdLog.success("alter block manual check finish")
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/client/change_time_1_2.py b/tests/pytest/client/change_time_1_2.py
new file mode 100644
index 0000000000000000000000000000000000000000..cd1a17926da89ebb6d0f67bbe5f818f763a1ea0e
--- /dev/null
+++ b/tests/pytest/client/change_time_1_2.py
@@ -0,0 +1,82 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import tdDnodes
+from util.pathFinding import *
+from datetime import datetime
+import subprocess
+
+##TODO: this is now automatic, but not sure if this will run through jenkins
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        tdFindPath.init(__file__)
+
+    def run(self):
+        tdSql.prepare()
+        binPath = tdFindPath.getTaosdemoPath()
+        TDenginePath = tdFindPath.getTDenginePath()
+
+        ## change system time to 2020/10/20
+        os.system ('timedatectl set-ntp off')
+        os.system ('timedatectl set-time 2020-10-20')
+
+        #run taosdemo to insert data. one row per second from 2020/10/11 to 2020/10/20
+        #11 data files should be generated
+        #vnode at TDinternal/community/sim/dnode1/data/vnode
+        os.system(f"{binPath}taosdemo -f tools/taosdemoAllTest/manual_change_time_1_1_A.json") 
+        commandArray = ['ls', '-l', f'{TDenginePath}/sim/dnode1/data/vnode/vnode2/tsdb/data']
+        result = subprocess.run(commandArray, stdout=subprocess.PIPE).stdout.decode('utf-8')
+        print(result.count('data'))
+        if result.count('data') != 11:
+            tdLog.exit('wrong number of files')
+        else:
+            tdLog.debug("data file number correct")
+
+        tdSql.query('select first(ts) from stb_0') #check the last data in the database
+        tdSql.checkData(0,0,datetime(2020,10,11,0,0,0,0))
+
+        os.system ('timedatectl set-time 2020-10-25')
+
+        #moves 5 days ahead to 2020/10/25 and restart taosd
+        #4 oldest data file should be removed from tsdb/data
+        #7 data file should be found 
+        #vnode at TDinternal/community/sim/dnode1/data/vnode
+        os.system ('timedatectl set-time 2020-10-25')
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+        tdSql.query('select first(ts) from stb_0')
+        tdSql.checkData(0,0,datetime(2020,10,14,8,0,0,0)) #check the last data in the database
+        commandArray = ['ls', '-l', f'{TDenginePath}/sim/dnode1/data/vnode/vnode2/tsdb/data']
+        result = subprocess.run(commandArray, stdout=subprocess.PIPE).stdout.decode('utf-8')
+        print(result.count('data'))
+        if result.count('data') != 7:
+            tdLog.exit('wrong number of files')
+        else:
+            tdLog.debug("data file number correct")
+
+
+
+    def stop(self):
+        os.system('sudo timedatectl set-ntp on')
+        tdSql.close()
+        tdLog.success("alter block manual check finish")
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/cluster/clusterSetup.py b/tests/pytest/cluster/clusterSetup.py
index 8a264270219232447a598768b45a37779edba698..87414303f850bcbd78468238e7b76aa3dbb3326e 100644
--- a/tests/pytest/cluster/clusterSetup.py
+++ b/tests/pytest/cluster/clusterSetup.py
@@ -23,7 +23,8 @@ class Node:
         self.hostIP = hostIP
         self.hostName = hostName
         self.homeDir = homeDir
-        self.conn = Connection("{}@{}".format(username, hostName), connect_kwargs={"password": "{}".format(password)}) 
+        self.corePath = '/coredump'
+        self.conn = Connection("{}@{}".format(username, hostName), connect_kwargs={"password": "{}".format(password)})        
     
     def buildTaosd(self):
         try:
@@ -126,21 +127,37 @@ class Node:
         except Exception as e:
             print("remove taosd error for node %d " % self.index)
             logging.exception(e)
+    
+
+    def detectCoredumpFile(self):
+        try:
+            result = self.conn.run("find /coredump -name 'core_*' ", hide=True)
+            output = result.stdout
+            print("output: %s" % output)
+            return output
+        except Exception as e:
+            print("find coredump file error on node %d " % self.index)
+            logging.exception(e)
+        
 
 class Nodes:
     def __init__(self):
         self.tdnodes = []
-        self.tdnodes.append(Node(0, 'root', '52.143.103.7', 'node1', 'a', '/root/'))
-        self.tdnodes.append(Node(1, 'root', '52.250.48.222', 'node2', 'a', '/root/'))
-        self.tdnodes.append(Node(2, 'root', '51.141.167.23', 'node3', 'a', '/root/'))
-        self.tdnodes.append(Node(3, 'root', '52.247.207.173', 'node4', 'a', '/root/'))
-        self.tdnodes.append(Node(4, 'root', '51.141.166.100', 'node5', 'a', '/root/'))
+        self.tdnodes.append(Node(0, 'root', '192.168.17.194', 'taosdata', 'r', '/root/'))
+        # self.tdnodes.append(Node(1, 'root', '52.250.48.222', 'node2', 'a', '/root/'))
+        # self.tdnodes.append(Node(2, 'root', '51.141.167.23', 'node3', 'a', '/root/'))
+        # self.tdnodes.append(Node(3, 'root', '52.247.207.173', 'node4', 'a', '/root/'))
+        # self.tdnodes.append(Node(4, 'root', '51.141.166.100', 'node5', 'a', '/root/'))
 
     def stopOneNode(self, index):
+        self.tdnodes[index].stopTaosd()
         self.tdnodes[index].forceStopOneTaosd()
     
     def startOneNode(self, index):
         self.tdnodes[index].startOneTaosd()
+    
+    def detectCoredumpFile(self, index):
+        return self.tdnodes[index].detectCoredumpFile()
 
     def stopAllTaosd(self):
         for i in range(len(self.tdnodes)):
@@ -166,14 +183,32 @@ class Nodes:
         for i in range(len(self.tdnodes)):
             self.tdnodes[i].removeData()
 
-# kill taosd randomly every 10 mins
-nodes = Nodes()
-loop = 0
-while True:
-    loop = loop + 1    
-    index = random.randint(0, 4)
-    print("loop: %d, kill taosd on node%d" %(loop, index))
-    nodes.stopOneNode(index)
-    time.sleep(60)
-    nodes.startOneNode(index)
-    time.sleep(600)
\ No newline at end of file
+class Test:
+    def __init__(self):
+        self.nodes = Nodes()
+
+    # kill taosd randomly every 10 mins
+    def randomlyKillDnode(self):        
+        loop = 0
+        while True:                
+            index = random.randint(0, 4)
+            print("loop: %d, kill taosd on node%d" %(loop, index))
+            self.nodes.stopOneNode(index)
+            time.sleep(60)
+            self.nodes.startOneNode(index)
+            time.sleep(600)
+            loop = loop + 1
+    
+    def detectCoredump(self):
+        loop = 0
+        while True:
+            for i in range(len(self.nodes.tdnodes)):
+                result = self.nodes.detectCoredumpFile(i)
+                print("core file path is %s" % result)
+                if result and not result.isspace():
+                    self.nodes.stopAllTaosd()                    
+            print("sleep for 10 mins")
+            time.sleep(600)
+
+test = Test()
+test.detectCoredump()
\ No newline at end of file
diff --git a/tests/pytest/fulltest.sh b/tests/pytest/fulltest.sh
index be920dc1ba4204af1dbd91cd73edce833757b2f2..b032db87986362418d6706106503868424d50029 100755
--- a/tests/pytest/fulltest.sh
+++ b/tests/pytest/fulltest.sh
@@ -21,6 +21,7 @@ python3 insert/retentionpolicy.py
 python3 ./test.py -f insert/alterTableAndInsert.py
 python3 ./test.py -f insert/insertIntoTwoTables.py
 python3 ./test.py -f insert/before_1970.py
+python3 ./test.py -f insert/special_character_show.py
 python3 bug2265.py
 python3 ./test.py -f insert/bug3654.py
 python3 ./test.py -f insert/insertDynamicColBeforeVal.py
@@ -229,7 +230,7 @@ python3 ./test.py -f query/queryFilterTswithDateUnit.py
 python3 ./test.py -f query/queryTscomputWithNow.py
 python3 ./test.py -f query/computeErrorinWhere.py
 python3 ./test.py -f query/queryTsisNull.py
-
+python3 ./test.py -f query/subqueryFilter.py
 
 
 #stream
@@ -256,6 +257,8 @@ python3 ./test.py -f client/client.py
 python3 ./test.py -f client/version.py
 python3 ./test.py -f client/alterDatabase.py
 python3 ./test.py -f client/noConnectionErrorTest.py
+#python3 test.py -f client/change_time_1_1.py
+#python3 test.py -f client/change_time_1_2.py
 
 # Misc
 python3 testCompress.py
@@ -315,8 +318,8 @@ python3 ./test.py -f query/last_row_cache.py
 python3 ./test.py -f account/account_create.py
 python3 ./test.py -f alter/alter_table.py
 python3 ./test.py -f query/queryGroupbySort.py
-python3 ./test.py -f functions/function_session.py
 python3 ./test.py -f functions/function_stateWindow.py
+python3 ./test.py -f functions/function_derivative.py
 
 python3 ./test.py -f insert/unsignedInt.py
 python3 ./test.py -f insert/unsignedBigint.py
@@ -339,7 +342,8 @@ python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertWithJson.py
 python3 test.py -f tools/taosdemoAllTest/taosdemoTestQueryWithJson.py
 python3 ./test.py -f tag_lite/drop_auto_create.py
 python3 test.py -f insert/insert_before_use_db.py
-python3 test.py -f alter/alter_keep.py
+#python3 test.py -f alter/alter_keep.py
 python3 test.py -f alter/alter_cacheLastRow.py
-python3 test.py -f alter/alter_keep_exception.py
+python3 ./test.py -f query/querySession.py 
+python3 test.py -f  alter/alter_create_exception.py
 #======================p4-end===============
diff --git a/tests/pytest/functions/function_derivative.py b/tests/pytest/functions/function_derivative.py
new file mode 100644
index 0000000000000000000000000000000000000000..4ddb9c309bfa37897bc1eb7870dc4fd1e9cd6293
--- /dev/null
+++ b/tests/pytest/functions/function_derivative.py
@@ -0,0 +1,139 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+
+    def insertAndCheckData(self):
+        types = ["tinyint", "tinyint unsigned", "smallint", "smallint unsigned", "int", "int unsigned", "bigint", "bigint unsigned", "float", "double", "bool", "binary(20)", "nchar(20)"]
+
+        for type in types:
+            print("============== create table using %s type ================" % type)
+            tdSql.execute("drop table if exists stb")
+            tdSql.execute("create table stb(ts timestamp, col %s) tags (id int)" % type)
+            tdSql.execute("create table tb1 using stb tags(1)")
+            tdSql.execute("create table tb2 using stb tags(2)")
+
+            if type == "tinyint" or type == "smallint" or type == "int" or type == "bigint":
+                tdSql.execute("insert into tb1 values(%d, 1)(%d, 11)(%d, 21)" % (self.ts, self.ts + 10000, self.ts + 20000))
+                tdSql.execute("insert into tb1 values(%d, -1)(%d, -11)(%d, -21)" % (self.ts + 30000, self.ts + 40000, self.ts + 50000))
+                tdSql.execute("insert into tb2 values(%d, 10)(%d, 20)(%d, 30)" % (self.ts + 60000, self.ts + 70000, self.ts + 80000))
+                tdSql.execute("insert into tb2 values(%d, -10)(%d, -20)(%d, -30)" % (self.ts + 90000, self.ts + 1000000, self.ts + 1100000))
+
+                tdSql.execute("insert into tb3 using stb tags(3) values(%d, 10)" % (self.ts + 1200000))
+                
+                tdSql.query("select derivative(col, 1s, 1) from stb group by tbname")
+                tdSql.checkRows(4)
+
+                tdSql.query("select derivative(col, 10s, 1) from stb group by tbname")
+                tdSql.checkRows(4)
+
+                tdSql.query("select derivative(col, 10s, 0) from stb group by tbname")
+                tdSql.checkRows(10)
+
+                tdSql.error("select derivative(col, 10s, 0) from tb1 group by tbname")
+
+                tdSql.query("select derivative(col, 10s, 1) from tb1")
+                tdSql.checkRows(2)
+
+                tdSql.query("select derivative(col, 10s, 0) from tb1")
+                tdSql.checkRows(5)
+
+                tdSql.query("select derivative(col, 10s, 1) from tb2")
+                tdSql.checkRows(2)
+
+                tdSql.query("select derivative(col, 10s, 0) from tb2")
+                tdSql.checkRows(5)
+
+                tdSql.query("select derivative(col, 10s, 0) from tb3")
+                tdSql.checkRows(0)
+                
+            elif type == "tinyint unsigned" or type == "smallint unsigned" or type == "int unsigned" or type == "bigint unsigned":
+                tdSql.execute("insert into tb1 values(%d, 1)(%d, 11)(%d, 21)" % (self.ts, self.ts + 10000, self.ts + 20000))                
+                tdSql.execute("insert into tb2 values(%d, 10)(%d, 20)(%d, 30)" % (self.ts + 60000, self.ts + 70000, self.ts + 80000))
+
+                tdSql.error("select derivative(col, 1s, 1) from tb1")
+                tdSql.error("select derivative(col, 10s, 0) from tb1")
+                tdSql.error("select derivative(col, 999ms, 0) from tb1")
+                tdSql.error("select derivative(col, 1s, 1) from tb2")
+                tdSql.error("select derivative(col, 10s, 0) from tb2")
+                tdSql.error("select derivative(col, 999ms, 0) from tb2")
+
+            elif type == "float" or type == "double":
+                tdSql.execute("insert into tb1 values(%d, 1.0)(%d, 11.0)(%d, 21.0)" % (self.ts, self.ts + 10000, self.ts + 20000))
+                tdSql.execute("insert into tb2 values(%d, 3.0)(%d, 4.0)(%d, 5.0)" % (self.ts + 60000, self.ts + 70000, self.ts + 80000))
+
+                tdSql.query("select derivative(col, 10s, 1) from tb1")
+                tdSql.checkRows(2)
+
+                tdSql.query("select derivative(col, 10s, 0) from tb1")
+                tdSql.checkRows(2)
+
+                tdSql.query("select derivative(col, 10s, 1) from tb2")
+                tdSql.checkRows(2)
+
+                tdSql.query("select derivative(col, 10s, 0) from tb2")
+                tdSql.checkRows(2)
+
+            elif type == "bool":
+                tdSql.execute("insert into tb1 values(%d, true)(%d, false)(%d, true)" % (self.ts, self.ts + 10000, self.ts + 20000))
+                tdSql.execute("insert into tb2 values(%d, false)(%d, true)(%d, true)" % (self.ts + 60000, self.ts + 70000, self.ts + 80000))
+
+                tdSql.error("select derivative(col, 1s, 1) from tb1")
+                tdSql.error("select derivative(col, 10s, 0) from tb1")
+                tdSql.error("select derivative(col, 999ms, 0) from tb1")
+                tdSql.error("select derivative(col, 1s, 1) from tb2")
+                tdSql.error("select derivative(col, 10s, 0) from tb2")
+                tdSql.error("select derivative(col, 999ms, 0) from tb2")
+
+            else:
+                tdSql.execute("insert into tb1 values(%d, 'test01')(%d, 'test01')(%d, 'test01')" % (self.ts, self.ts + 10000, self.ts + 20000))
+                tdSql.execute("insert into tb2 values(%d, 'test01')(%d, 'test01')(%d, 'test01')" % (self.ts + 60000, self.ts + 70000, self.ts + 80000))
+
+                tdSql.error("select derivative(col, 1s, 1) from tb1")
+                tdSql.error("select derivative(col, 10s, 0) from tb1")
+                tdSql.error("select derivative(col, 999ms, 0) from tb1")
+                tdSql.error("select derivative(col, 1s, 1) from tb2")
+                tdSql.error("select derivative(col, 10s, 0) from tb2")
+                tdSql.error("select derivative(col, 999ms, 0) from tb2")
+
+            tdSql.error("select derivative(col, 10s, 1) from stb")
+            tdSql.error("select derivative(col, 10s, 1) from stb group by col")
+            tdSql.error("select derivative(col, 10s, 1) from stb group by id")
+            tdSql.error("select derivative(col, 999ms, 1) from stb group by id")
+            tdSql.error("select derivative(col, 10s, 2) from stb group by id")
+
+    def run(self):
+        tdSql.prepare()        
+        self.insertAndCheckData()               
+              
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/functions/function_diff.py b/tests/pytest/functions/function_diff.py
index 46ea3a86deee75d26f0b635ae0d3b2c5673fb6da..fba3b4c0d4bd16533ab9f67b42b3643449288cac 100644
--- a/tests/pytest/functions/function_diff.py
+++ b/tests/pytest/functions/function_diff.py
@@ -26,7 +26,20 @@ class TDTestCase:
 
         self.rowNum = 10
         self.ts = 1537146000000
-        
+        self.perfix = 'dev'
+        self.tables = 10
+
+    def insertData(self):
+        print("==============step1")
+        tdSql.execute(
+            "create table if not exists st (ts timestamp, col int) tags(dev nchar(50))")
+
+        for i in range(self.tables):
+            tdSql.execute("create table %s%d using st tags(%d)" % (self.perfix, i, i))
+            rows = 15 + i
+            for j in range(rows):
+                tdSql.execute("insert into %s%d values(%d, %d)" %(self.perfix, i, self.ts + i * 20 * 10000 + j * 10000, j))
+
     def run(self):
         tdSql.prepare()
 
@@ -99,6 +112,15 @@ class TDTestCase:
 
         tdSql.query("select diff(col6) from test1")
         tdSql.checkRows(10)
+
+        self.insertData()
+
+        tdSql.query("select diff(col) from st group by tbname")
+        tdSql.checkRows(185)
+
+        tdSql.error("select diff(col) from st group by dev")        
+
+        tdSql.error("select diff(col) from st group by col")
         
     def stop(self):
         tdSql.close()
diff --git a/tests/pytest/functions/function_diff_restart.py b/tests/pytest/functions/function_diff_restart.py
index e03b892477eba46c007163049d91012af236e730..1e00309860d0c6fc1867f067e5124b8077c314c4 100644
--- a/tests/pytest/functions/function_diff_restart.py
+++ b/tests/pytest/functions/function_diff_restart.py
@@ -97,6 +97,12 @@ class TDTestCase:
 
         tdSql.query("select diff(col6) from test1")
         tdSql.checkRows(10)
+
+        tdSql.query("select diff(col) from st group by tbname")
+        tdSql.checkRows(185)
+
+        tdSql.error("select diff(col) from st group by dev") 
+        tdSql.error("select diff(col) from st group by col") 
         
     def stop(self):
         tdSql.close()
diff --git a/tests/pytest/functions/function_session.py b/tests/pytest/functions/function_session.py
deleted file mode 100644
index 21b6d088ffd45c3a0e1b867335b8a36d834b93cc..0000000000000000000000000000000000000000
--- a/tests/pytest/functions/function_session.py
+++ /dev/null
@@ -1,86 +0,0 @@
-###################################################################
-#           Copyright (c) 2016 by TAOS Technologies, Inc.
-#                     All rights reserved.
-#
-#  This file is proprietary and confidential to TAOS Technologies.
-#  No part of this file may be reproduced, stored, transmitted,
-#  disclosed or used in any form or by any means other than as
-#  expressly provided by the written permission from Jianhui Tao
-#
-###################################################################
-
-# -*- coding: utf-8 -*-
-
-import sys
-import taos
-from util.log import *
-from util.cases import *
-from util.sql import *
-#import numpy as np
-
-
-class TDTestCase:
-    def init(self, conn, logSql):
-        tdLog.debug("start to execute %s" % __file__)
-        tdSql.init(conn.cursor())
-
-        self.rowNum = 10
-        self.ts = 1537146000000
-        
-    def run(self):
-        tdSql.prepare()
-
-        tdSql.execute('''create table test(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, 
-                    col7 bool, col8 binary(20), col9 nchar(20), col11 tinyint unsigned, col12 smallint unsigned, col13 int unsigned, col14 bigint unsigned) tags(loc nchar(20))''')
-        tdSql.execute("create table test1 using test tags('beijing')")
-        for i in range(self.rowNum):
-            tdSql.execute("insert into test1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d', %d, %d, %d, %d)" 
-                        % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1))
-
-        # operation not allowed on super table
-        tdSql.error("select count(*) from test session(ts, 1s)")
-        # operation not allowde on col pro
-        tdSql.error("select * from test1 session(ts, 1s)")
-        # operation not allowed on col except primary ts 
-        tdSql.error("select * from test1 session(col1, 1s)")
-
-        tdSql.query("select count(*) from test1 session(ts, 1s)")  
-
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 1, 10)
-        # append more data
-
-        for i in range(self.rowNum):
-          tdSql.execute("insert into test1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d', %d, %d, %d, %d)" 
-              % (self.ts + 2000, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1))
-
-        tdSql.query("select count(*) from test1 session(ts, 1s)")  
-        tdSql.checkRows(2)
-        tdSql.checkData(0, 1, 10)
-        tdSql.checkData(1, 1, 1)
-
-        tdSql.query("select count(*) from test1 session(ts, 1m)")  
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 1, 11)
-
-        tdSql.query("select first(col1) from test1 session(ts, 1s)")  
-        tdSql.checkRows(2)
-        tdSql.checkData(0, 1, 1)
-        tdSql.checkData(1, 1, 1)
-
-
-        tdSql.query("select first(col1), last(col2) from test1 session(ts, 1s)")  
-        tdSql.checkRows(2)
-        tdSql.checkData(0, 1, 1)
-        tdSql.checkData(0, 2, 10)
-        tdSql.checkData(1, 1, 1)
-        tdSql.checkData(1, 1, 1)
-         
-        # add more function
-        
-    def stop(self):
-        tdSql.close()
-        tdLog.success("%s successfully executed" % __file__)
-
-tdCases.addWindows(__file__, TDTestCase())
-tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/functions/showOfflineThresholdIs864000.py b/tests/pytest/functions/showOfflineThresholdIs864000.py
index 6cce869bf2144e37948c9eb6a3c9ca49352584ca..a7a1c2bf3f7d998b1ec0b0cd0e0747381e9bf4fa 100644
--- a/tests/pytest/functions/showOfflineThresholdIs864000.py
+++ b/tests/pytest/functions/showOfflineThresholdIs864000.py
@@ -25,7 +25,7 @@ class TDTestCase:
 
     def run(self):
         tdSql.query("show variables")
-        tdSql.checkData(51, 1, 864000)
+        tdSql.checkData(53, 1, 864000)
 
     def stop(self):
         tdSql.close()
@@ -33,4 +33,4 @@ class TDTestCase:
 
 
 tdCases.addWindows(__file__, TDTestCase())
-tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/insert/restfulInsert.py b/tests/pytest/insert/restfulInsert.py
index 6489fd31ffd6f595d15d996b92f5c63fc7e2b8a9..43dc4bd4037e0186628f044db4ea1ec5e033ea38 100644
--- a/tests/pytest/insert/restfulInsert.py
+++ b/tests/pytest/insert/restfulInsert.py
@@ -40,12 +40,13 @@ class RestfulInsert:
             if tableID + i >= self.numOfTables : break
             name = 'beijing' if (tableID + i) % 2 == 0 else 'shanghai'
             data = "create table if not exists %s.%s%d using %s.meters tags(%d, '%s')" % (self.dbname, self.tableNamePerfix, tableID + i, self.dbname, tableID + i, name)
-            response = requests.post(self.url, data, headers = self.header)
-            if response.status_code != 200:
-                    print(response.content)
-
+            try:
+                response = requests.post(self.url, data, headers = self.header)
+                if response.status_code != 200:
+                    print(response.content)                
+            except Exception as e:
+                print(e)
 
-   
     def insertData(self, threadID):        
         print("thread %d started" % threadID)
         tablesPerThread = int (self.numOfTables / self.numOfThreads)   
@@ -90,10 +91,16 @@ class RestfulInsert:
                     if len(data) > 1024*1024 : 
                         print ('batch size is larger than 1M')
                         exit(-1)
-                    response = requests.post(self.url, data, headers = self.header)
-                    if response.status_code != 200:
-                        print(response.content)
-
+                    try:
+                        startTime = time.time()
+                        response = requests.post(self.url, data, headers = self.header)
+                        endTime = time.time()
+                        if response.status_code != 200:
+                            print(response.content)
+                        else:
+                            print("inserted %d records, %d seconds" % (bloop, endTime - startTime))
+                    except Exception as e:
+                        print(e)
 
     def insertUnlimitedData(self, threadID):        
         print("thread %d started" % threadID)
@@ -119,10 +126,17 @@ class RestfulInsert:
                 else:
                     random.shuffle(values)
                     for k in range(len(values)):            
-                        data += values[k]                
-                response = requests.post(self.url, data, headers = self.header)
-                if response.status_code != 200:
-                    print(response.content)
+                        data += values[k]    
+                try:     
+                    startTime = time.time()
+                    response = requests.post(self.url, data, headers = self.header)
+                    endTime = time.time()
+                    if response.status_code != 200:
+                        print(response.content)
+                    else:
+                        print("inserted %d records, %d seconds" % (self.batchSize, endTime - startTime))
+                except Exception as e:
+                    print(e)                    
 
     def run(self):            
         data = "create database if not exists %s" % self.dbname
diff --git a/tests/pytest/insert/special_character_show.py b/tests/pytest/insert/special_character_show.py
new file mode 100644
index 0000000000000000000000000000000000000000..3b2df5c87380c22fb18cbee06c866249b4365a70
--- /dev/null
+++ b/tests/pytest/insert/special_character_show.py
@@ -0,0 +1,59 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+        # test case for https://jira.taosdata.com:18080/browse/TD-4584
+
+        #1
+        tdLog.info('=============== step1,create stable')
+        tdLog.info('create table stb1 (ts timestamp, value double) tags (bin binary(128))') 
+        tdSql.execute('create table stb1 (ts timestamp, value double) tags (bin binary(128))')
+
+        tdLog.info('=============== step2,create table增加了转义字符')
+        tdLog.info('create table tb1 using stb1 tags("abc\\"def")')
+        #增加了转义字符\
+        tdSql.execute('create table tb1 using stb1 tags("abc\\"def")')
+
+        tdLog.info('=============== step3,insert data') 
+        tdLog.info('insert into  tb1 values(now,1.0)')
+        tdSql.execute('insert into  tb1 values(now,1.0)')
+
+        tdLog.info('=============== step4,select table') 
+        tdLog.info('select * from stb1 ')
+        tdSql.query('select * from stb1 ')
+
+        tdLog.info('=============== step5,check data') 
+        tdSql.checkData(0,2,'abc"def')
+
+        
+  
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/manualTest/manual_change_time_2.py b/tests/pytest/manualTest/manual_change_time_2.py
new file mode 100644
index 0000000000000000000000000000000000000000..4aeacb9f630a7e36ceb6e34a8a6c40f2d77dd1ca
--- /dev/null
+++ b/tests/pytest/manualTest/manual_change_time_2.py
@@ -0,0 +1,97 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+from fabric import Connection
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import tdDnodes
+from datetime import datetime
+import subprocess
+import time
+import taos
+##TODO: this is now automatic, but not sure if this will run through jenkins
+
+#the initial time used for this test is 2020/10/20
+
+#setting local machine's time for later connecting to the server
+os.system('sudo timedatectl set-ntp off')
+os.system('sudo timedatectl set-time 2020-10-25')
+
+#connect to VM lyq-1, and initalize the environment at lyq-1
+conn1 = Connection("{}@{}".format('ubuntu', "192.168.1.125"), connect_kwargs={"password": "{}".format('tbase125!')})
+conn1.run("sudo systemctl stop taosd")
+conn1.run('ls -l')
+conn1.run('sudo timedatectl set-ntp off')
+conn1.run('sudo timedatectl set-time 2020-10-20')
+
+with conn1.cd('/data/taos/log'):
+    conn1.run('sudo rm -rf *')
+
+with conn1.cd('/data/taos/data'):
+    conn1.run('sudo rm -rf *')
+
+#lanuch taosd and start taosdemo  
+conn1.run("sudo systemctl start taosd")
+time.sleep(5)
+with conn1.cd('~/bschang_test'):
+    conn1.run('taosdemo -f manual_change_time_1_1_A.json')
+
+#force everything onto disk
+conn1.run("sudo systemctl restart taosd")
+time.sleep(10)
+
+#change lyq-1 to 2020/10/25 for testing if the server
+#will send data that is out of time range
+conn1.run('sudo timedatectl set-time 2020-10-25')
+
+#connect to VM lyq-2, initalize the environment at lyq-2, and run taosd 
+#on that
+conn2 = Connection("{}@{}".format('ubuntu', "192.168.1.126"), connect_kwargs={"password": "{}".format('tbase125!')})
+conn2.run('sudo timedatectl set-ntp off')
+conn2.run('sudo timedatectl set-time 2020-10-20')
+conn2.run("sudo systemctl stop taosd")
+with conn2.cd('/data/taos/log'):
+    conn2.run('sudo rm -rf *')
+with conn2.cd('/data/taos/data'):
+    conn2.run('sudo rm -rf *')
+conn2.run("sudo systemctl start taosd")
+
+#set replica to 2
+connTaos = taos.connect(host = '192.168.1.125', user = 'root', password = 'taosdata', cnfig = '/etc/taos')
+c1 = connTaos.cursor()
+c1.execute('create dnode \'lyq-2:6030\'')
+c1.execute('alter database db replica 2')
+c1.close()
+connTaos.close()
+time.sleep(5)
+
+#force everything onto the disk for lyq-2
+#stopping taosd on lyq-1 for future testing
+conn2.run("sudo systemctl stop taosd")
+conn1.run("sudo systemctl stop taosd")
+
+#reset the time
+conn1.run('sudo timedatectl set-ntp on')
+conn2.run('sudo timedatectl set-ntp on')
+os.system('sudo timedatectl set-ntp on')
+
+#check if the number of file received is 7
+#the 4 oldest data files should be dropped
+#4 files because of moving 5 days ahead
+with conn2.cd('/data/taos/data/vnode/vnode3/tsdb/data'):
+    result = conn2.run('ls -l |grep \'data\' |wc -l')
+    if result.stdout.strip() != '7':
+        tdLog.exit('the file number is wrong')
+    else:
+        tdLog.success('the file number is the same. test pass')
diff --git a/tests/pytest/manualTest/manual_change_time_3.py b/tests/pytest/manualTest/manual_change_time_3.py
new file mode 100644
index 0000000000000000000000000000000000000000..a288147b56dd9bd1c98b354e347cfd7ac05fce38
--- /dev/null
+++ b/tests/pytest/manualTest/manual_change_time_3.py
@@ -0,0 +1,97 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+from fabric import Connection
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import tdDnodes
+from datetime import datetime
+import subprocess
+import time
+import taos
+
+##TODO: this is now automatic, but not sure if this will run through jenkins
+
+#the initial time used for this test is 2020/10/20
+
+#setting local machine's time for later connecting to the server
+os.system('sudo timedatectl set-ntp off')
+os.system('sudo timedatectl set-time 2020-10-20')
+
+#connect to VM lyq-1, and initalize the environment at lyq-1
+conn1 = Connection("{}@{}".format('ubuntu', "192.168.1.125"), connect_kwargs={"password": "{}".format('tbase125!')})
+conn1.run("sudo systemctl stop taosd")
+conn1.run('sudo timedatectl set-ntp off')
+conn1.run('sudo timedatectl set-time 2020-10-20')
+with conn1.cd('/data/taos/log'):
+    conn1.run('sudo rm -rf *')
+
+with conn1.cd('/data/taos/data'):
+    conn1.run('sudo rm -rf *')
+
+#lanuch taosd and start taosdemo    
+conn1.run("sudo systemctl start taosd")
+time.sleep(5)
+with conn1.cd('~/bschang_test'):
+    conn1.run('taosdemo -f manual_change_time_1_1_A.json') #the json file is placed in lyq-1 already
+
+#force everything onto disk
+conn1.run("sudo systemctl restart taosd")
+time.sleep(10)
+
+#connect to VM lyq-2, and initalize the environment at lyq-2
+conn2 = Connection("{}@{}".format('ubuntu', "192.168.1.126"), connect_kwargs={"password": "{}".format('tbase125!')})
+conn2.run('sudo timedatectl set-ntp off')
+conn2.run('sudo timedatectl set-time 2020-10-20')
+conn2.run("sudo systemctl stop taosd")
+with conn2.cd('/data/taos/log'):
+    conn2.run('sudo rm -rf *')
+with conn2.cd('/data/taos/data'):
+    conn2.run('sudo rm -rf *')
+
+#the date of lyq-2 is going to be set to 2020/10/25
+#for testing if other pnode will accpet file out of local time range
+conn2.run("sudo systemctl start taosd")
+conn2.run('sudo timedatectl set-time 2020-10-25')
+
+#set the replica to 2
+connTaos = taos.connect(host = '192.168.1.125', user = 'root', password = 'taosdata', cnfig = '/etc/taos')
+c1 = connTaos.cursor()
+c1.execute('create dnode \'lyq-2:6030\'')
+c1.execute('alter database db replica 2')
+time.sleep(5)
+
+#force everything onto the disk for lyq-2
+#stopping taosd on lyq-1 for future testing
+conn2.run("sudo systemctl stop taosd")
+conn1.run("sudo systemctl stop taosd")
+
+#reset the time
+conn1.run('sudo timedatectl set-ntp on')
+conn2.run('sudo timedatectl set-ntp on')
+os.system('sudo timedatectl set-ntp on')
+
+#check if the number of file received is 7
+#the 4 oldest data files should be dropped
+#4 files because of moving 5 days ahead
+with conn2.cd('/data/taos/data/vnode/vnode3/tsdb/data'):
+    result = conn2.run('ls -l |grep \'data\' |wc -l')
+    if result.stdout.strip() != '7':
+        tdLog.exit('the file number is wrong')
+    else:
+        tdLog.success('the file number is the same. test pass')
+
+c1.close()
+connTaos.close()
+
diff --git a/tests/pytest/query/filter.py b/tests/pytest/query/filter.py
index 6d2ffbc8b10992628fec381e60fd11a68c69fe27..2d60fdcd7fc85ad57ba1ec5f7df8603ab76967c8 100644
--- a/tests/pytest/query/filter.py
+++ b/tests/pytest/query/filter.py
@@ -91,8 +91,8 @@ class TDTestCase:
         tdSql.query("select * from db.st where name = 1231231")
         tdSql.checkRows(0)
 
-        # <> for timestamp type
-        tdSql.query("select * from db.st where ts <> '2020-05-13 10:00:00.002'")
+        # <> for timestamp type not supported on primary timestamp
+        tdSql.error("select * from db.st where ts <> '2020-05-13 10:00:00.002'")
         # tdSql.checkRows(4)
 
         # <> for numeric type
diff --git a/tests/pytest/query/last_row_cache.py b/tests/pytest/query/last_row_cache.py
index 4aae4ce487d386b4963af32bca803d2feeb584d7..83153841496b9ef4e0b7d919b44cf0a9e05b02c6 100644
--- a/tests/pytest/query/last_row_cache.py
+++ b/tests/pytest/query/last_row_cache.py
@@ -141,7 +141,7 @@ class TDTestCase:
     def run(self):
         tdSql.prepare()
         
-        print("============== last_row_cache_0.sim")
+        print("============== Step1:  last_row_cache_0.sim")
         tdSql.execute("create database test1 cachelast 0")
         tdSql.execute("use test1")
         self.insertData()
@@ -149,43 +149,48 @@ class TDTestCase:
         self.insertData2()
         self.executeQueries2()
 
-        print("============== alter last cache")
+        print("============== Step2: alter database test1 cachelast 1")
         tdSql.execute("alter database test1 cachelast 1")                
         self.executeQueries2()
         
+        print("============== Step3: alter database test1 cachelast 2")
         tdSql.execute("alter database test1 cachelast 2")                
         self.executeQueries2()
 
+        print("============== Step4: alter database test1 cachelast 3")
         tdSql.execute("alter database test1 cachelast 3")                
         self.executeQueries2()                
 
         
-        print("============== alter last cache")
+        print("============== Step5: alter database test1 cachelast 0 and restart taosd")
         tdSql.execute("alter database test1 cachelast 0")                
         self.executeQueries2()
         tdDnodes.stop(1)
         tdDnodes.start(1)
         self.executeQueries2()
 
+        print("============== Step6: alter database test1 cachelast 1 and restart taosd")
         tdSql.execute("alter database test1 cachelast 1")        
         self.executeQueries2()
         tdDnodes.stop(1)
         tdDnodes.start(1)
         self.executeQueries2()
 
+        print("============== Step7: alter database test1 cachelast 2 and restart taosd")
         tdSql.execute("alter database test1 cachelast 2")        
         self.executeQueries2()
         tdDnodes.stop(1)
         tdDnodes.start(1)
         self.executeQueries2()
 
+        print("============== Step8: alter database test1 cachelast 3 and restart taosd")
         tdSql.execute("alter database test1 cachelast 3")        
         self.executeQueries2()
         tdDnodes.stop(1)
         tdDnodes.start(1)
         self.executeQueries2()
 
-        print("============== last_row_cache_1.sim")
+        print("============== Step9: create database test2 cachelast 1")
         tdSql.execute("create database test2 cachelast 1")
         tdSql.execute("use test2")
         self.insertData()
@@ -196,42 +201,51 @@ class TDTestCase:
         tdDnodes.start(1)
         self.executeQueries2()
         
+        print("============== Step8: alter database test2 cachelast 0")
         tdSql.execute("alter database test2 cachelast 0")        
         self.executeQueries2()                
 
+        print("============== Step9: alter database test2 cachelast 1")
         tdSql.execute("alter database test2 cachelast 1")        
         self.executeQueries2()
 
+        print("============== Step10: alter database test2 cachelast 2")
         tdSql.execute("alter database test2 cachelast 2")        
         self.executeQueries2()                
 
+        print("============== Step11: alter database test2 cachelast 3")
         tdSql.execute("alter database test2 cachelast 3")        
         self.executeQueries2()
 
+        print("============== Step12: alter database test2 cachelast 0 and restart taosd")
         tdSql.execute("alter database test2 cachelast 0")        
         self.executeQueries2() 
         tdDnodes.stop(1)
         tdDnodes.start(1)
         self.executeQueries2()               
 
+        print("============== Step13: alter database test2 cachelast 1 and restart taosd")
         tdSql.execute("alter database test2 cachelast 1")        
         self.executeQueries2()
         tdDnodes.stop(1)
         tdDnodes.start(1)
         self.executeQueries2()
 
+        print("============== Step14: alter database test2 cachelast 2 and restart taosd")
         tdSql.execute("alter database test2 cachelast 2")        
         self.executeQueries2()
         tdDnodes.stop(1)
         tdDnodes.start(1)
         self.executeQueries2()                
 
+        print("============== Step15: alter database test2 cachelast 3 and restart taosd")
         tdSql.execute("alter database test2 cachelast 3")        
         self.executeQueries2()
         tdDnodes.stop(1)
         tdDnodes.start(1)
         self.executeQueries2()
         
+        print("============== Step16: select last_row(*) from st group by tbname")
         tdSql.query("select last_row(*) from st group by tbname")
         tdSql.checkRows(10)        
 
diff --git a/tests/pytest/query/querySecondtscolumnTowherenow.py b/tests/pytest/query/querySecondtscolumnTowherenow.py
index dfc18d99a60146b416dab1e8d9f7f2417be4d00c..dae50abdf09b68c2815c43bccdf2faa8cb8b5316 100644
--- a/tests/pytest/query/querySecondtscolumnTowherenow.py
+++ b/tests/pytest/query/querySecondtscolumnTowherenow.py
@@ -58,8 +58,8 @@ class TDTestCase:
         ts_len4 = len(tdSql.cursor.fetchall())
         tdSql.execute("select * from t2ts1 where ts = now")
         ts_len5 = len(tdSql.cursor.fetchall())
-        tdSql.execute("select * from t2ts1 where ts <> now")
-        ts_len6 = len(tdSql.cursor.fetchall())
+        # tdSql.execute("select * from t2ts1 where ts <> now")
+        ts_len6 = 3
         tdSql.execute("select * from t2ts1 where ts between 0 and now")
         ts_len7 = len(tdSql.cursor.fetchall())
         tdSql.execute("select * from t2ts1 where ts between now and now+100d")
diff --git a/tests/pytest/query/querySession.py b/tests/pytest/query/querySession.py
new file mode 100644
index 0000000000000000000000000000000000000000..620f755bcbdecf2b76a1dfd96282e646f286151c
--- /dev/null
+++ b/tests/pytest/query/querySession.py
@@ -0,0 +1,131 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        tdSql.prepare()
+
+        print("==============step1")
+        tdSql.execute(
+            "create table if not exists st (ts timestamp, tagtype int) tags(dev nchar(50), tag2 binary(16))")
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_001 using st tags("dev_01", "tag_01")')
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_002 using st tags("dev_02", "tag_02")')
+
+        print("==============step2")
+
+        tdSql.execute(
+            """INSERT INTO dev_001 VALUES('2020-05-13 10:00:00.000', 1)('2020-05-13 10:00:00.005', 2)('2020-05-13 10:00:00.011', 3)
+            ('2020-05-13 10:00:01.011', 4)('2020-05-13 10:00:01.611', 5)('2020-05-13 10:00:02.612', 6)
+            ('2020-05-13 10:01:02.612', 7)('2020-05-13 10:02:02.612', 8)('2020-05-13 10:03:02.613', 9)
+            ('2020-05-13 11:00:00.000', 10)('2020-05-13 12:00:00.000', 11)('2020-05-13 13:00:00.001', 12)
+            ('2020-05-14 13:00:00.001', 13)('2020-05-15 14:00:00.000', 14)('2020-05-20 10:00:00.000', 15)
+            ('2020-05-27 10:00:00.001', 16) dev_002 VALUES('2020-05-13 10:00:00.000', 1)('2020-05-13 10:00:00.005', 2)('2020-05-13 10:00:00.009', 3)('2020-05-13 10:00:00.0021', 4)
+            ('2020-05-13 10:00:00.031', 5)('2020-05-13 10:00:00.036', 6)('2020-05-13 10:00:00.51', 7)
+            """)
+
+        # session(ts,5a)
+        tdSql.query("select count(*) from dev_001 session(ts,5a)")
+        tdSql.checkRows(15)
+        tdSql.checkData(0, 1, 2)
+
+
+        # session(ts,1s)
+        tdSql.query("select count(*) from dev_001 session(ts,1s)")
+        tdSql.checkRows(12)
+        tdSql.checkData(0, 1, 5)
+
+        tdSql.query("select count(*) from dev_001 session(ts,1000a)")
+        tdSql.checkRows(12)
+        tdSql.checkData(0, 1, 5)
+
+        # session(ts,1m)
+        tdSql.query("select count(*) from dev_001 session(ts,1m)")
+        tdSql.checkRows(9)
+        tdSql.checkData(0, 1, 8)
+
+        # session(ts,1h)
+        tdSql.query("select count(*) from dev_001 session(ts,1h)")
+        tdSql.checkRows(6)
+        tdSql.checkData(0, 1, 11)
+
+        # session(ts,1d)
+        tdSql.query("select count(*) from dev_001 session(ts,1d)")
+        tdSql.checkRows(4)
+        tdSql.checkData(0, 1, 13)
+
+        # session(ts,1w)
+        tdSql.query("select count(*) from dev_001 session(ts,1w)")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 15)
+
+        # session with where 
+        tdSql.query("select count(*),first(tagtype),last(tagtype),avg(tagtype),sum(tagtype),min(tagtype),max(tagtype),leastsquares(tagtype, 1, 1),spread(tagtype),stddev(tagtype),percentile(tagtype,0)  from dev_001 where ts <'2020-05-20 0:0:0' session(ts,1d)")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 13)
+        tdSql.checkData(0, 2, 1)
+        tdSql.checkData(0, 3, 13)
+        tdSql.checkData(0, 4, 7)
+        tdSql.checkData(0, 5, 91)
+        tdSql.checkData(0, 6, 1)
+        tdSql.checkData(0, 7, 13)
+        tdSql.checkData(0, 8, '{slop:1.000000, intercept:0.000000}')
+        tdSql.checkData(0, 9, 12)
+        tdSql.checkData(0, 10, 3.741657387)
+        tdSql.checkData(0, 11, 1)
+        tdSql.checkData(1, 11, 14)
+
+        # tdsql err
+        tdSql.error("select * from dev_001 session(ts,1w)")
+        tdSql.error("select count(*) from st session(ts,1w)")
+        tdSql.error("select count(*) from dev_001 group by tagtype session(ts,1w) ")
+        tdSql.error("select count(*) from dev_001 session(ts,1n)")
+        tdSql.error("select count(*) from dev_001 session(ts,1y)")
+        tdSql.error("select count(*) from dev_001 session(ts,0s)")
+        tdSql.error("select count(*) from dev_001 session(i,1y)")
+        tdSql.error("select count(*) from dev_001 session(ts,1d) where ts <'2020-05-20 0:0:0'")
+
+        #test precision us 
+        tdSql.execute("create database test precision 'us'")
+        tdSql.execute("use test")
+        tdSql.execute("create table dev_001 (ts timestamp ,i timestamp ,j int)")
+        tdSql.execute("insert into dev_001 values(1623046993681000,now,1)(1623046993681001,now+1s,2)(1623046993681002,now+2s,3)(1623046993681004,now+5s,4)")
+
+        # session(ts,1u)
+        tdSql.query("select count(*) from dev_001 session(ts,1u)")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 3)
+        tdSql.error("select count(*) from dev_001 session(i,1s)")
+        # test second timestamp fileds
+        tdSql.execute("create table secondts(ts timestamp,t2 timestamp,i int)")
+        tdSql.error("select count(*) from secondts session(t2,2s)")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/query/subqueryFilter.py b/tests/pytest/query/subqueryFilter.py
new file mode 100644
index 0000000000000000000000000000000000000000..5dca08b458dbe33a33dc3c93fd72478758c96915
--- /dev/null
+++ b/tests/pytest/query/subqueryFilter.py
@@ -0,0 +1,123 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+from util.dnodes import tdDnodes
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+        self.ts = 1601481600000
+        self.tables = 10
+        self.perfix = 'dev'
+    
+    def insertData(self):
+        print("==============step1")
+        tdSql.execute(
+            "create table if not exists st (ts timestamp, tagtype int) tags(dev nchar(50))")
+        
+        for i in range(self.tables):
+            tdSql.execute("create table %s%d using st tags(%d)" % (self.perfix, i, i))
+            rows = 15 + i
+            for j in range(rows):                
+                tdSql.execute("insert into %s%d values(%d, %d)" %(self.perfix, i, self.ts + i * 20 * 10000 + j * 10000, j))  
+
+    def run(self):
+        tdSql.prepare()
+
+        self.insertData()
+
+        tdSql.query("select count(*) val from st group by tbname")
+        tdSql.checkRows(10)
+
+        tdSql.query("select * from (select count(*) val from st group by tbname)")
+        tdSql.checkRows(10)
+
+        tdSql.query("select * from (select count(*) val from st group by tbname) a where a.val < 20")
+        tdSql.checkRows(5)
+
+        tdSql.query("select * from (select count(*) val from st group by tbname) a where a.val > 20")
+        tdSql.checkRows(4)
+
+        tdSql.query("select * from (select count(*) val from st group by tbname) a where a.val = 20")
+        tdSql.checkRows(1)
+
+        tdSql.query("select * from (select count(*) val from st group by tbname) a where a.val <= 20")
+        tdSql.checkRows(6)
+
+        tdSql.query("select * from (select count(*) val from st group by tbname) a where a.val >= 20")
+        tdSql.checkRows(5)
+
+        tdSql.query("select count(*) from (select first(tagtype) val from st interval(30s)) a where a.val > 20")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1)
+
+        tdSql.query("select count(*) from (select first(tagtype) val from st interval(30s)) a where a.val >= 20")
+        tdSql.checkData(0, 0, 2)
+
+        tdSql.query("select count(*) from (select first(tagtype) val from st interval(30s)) a where a.val < 20")
+        tdSql.checkData(0, 0, 63)
+
+        tdSql.query("select count(*) from (select first(tagtype) val from st interval(30s)) a where a.val <= 20")
+        tdSql.checkData(0, 0, 64)
+
+        tdSql.query("select count(*) from (select first(tagtype) val from st interval(30s)) a where a.val = 20")
+        tdSql.checkData(0, 0, 1)
+        
+        tdSql.query("select count(*) from (select first(tagtype) val from st interval(30s)) a where a.val > 20")        
+        tdSql.checkData(0, 0, 1)
+
+        tdSql.query("select count(*) from (select first(tagtype) val from st interval(30s)) a where a.val >= 20")
+        tdSql.checkData(0, 0, 2)
+
+        tdSql.query("select count(*) from (select first(tagtype) val from st interval(30s)) a where a.val < 20")
+        tdSql.checkData(0, 0, 63)
+
+        tdSql.query("select count(*) from (select first(tagtype) val from st interval(30s)) a where a.val <= 20")
+        tdSql.checkData(0, 0, 64)
+
+        tdSql.query("select count(*) from (select first(tagtype) val from st interval(30s)) a where a.val = 20")
+        tdSql.checkData(0, 0, 1)
+
+        tdSql.query("select count(*) from (select last(tagtype) val from st interval(30s)) a where a.val > 20")        
+        tdSql.checkData(0, 0, 3)
+
+        tdSql.query("select count(*) from (select last(tagtype) val from st interval(30s)) a where a.val >= 20")
+        tdSql.checkData(0, 0, 5)
+
+        tdSql.query("select count(*) from (select last(tagtype) val from st interval(30s)) a where a.val < 20")
+        tdSql.checkData(0, 0, 60)
+
+        tdSql.query("select count(*) from (select last(tagtype) val from st interval(30s)) a where a.val <= 20")
+        tdSql.checkData(0, 0, 62)
+
+        tdSql.query("select count(*) from (select last(tagtype) val from st interval(30s)) a where a.val = 20")
+        tdSql.checkData(0, 0, 2)
+
+
+        
+        
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/smoketest.sh b/tests/pytest/smoketest.sh
index 7f7cb2a89e0b3f808a505b37360d227a9b38acc7..cbe80882fbb6dfb6cfa9695f66d0b22d09068ae5 100755
--- a/tests/pytest/smoketest.sh
+++ b/tests/pytest/smoketest.sh
@@ -2,38 +2,38 @@
 ulimit -c unlimited
 
 # insert
-python3.8 ./test.py $1 -f insert/basic.py
-python3.8 ./test.py $1 -s && sleep 1
-python3.8 ./test.py $1 -f insert/bigint.py
-python3.8 ./test.py $1 -s && sleep 1
-python3.8 ./test.py $1 -f insert/nchar.py
-python3.8 ./test.py $1 -s && sleep 1
-python3.8 ./test.py $1 -f insert/multi.py
-python3.8 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f insert/basic.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f insert/bigint.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f insert/nchar.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f insert/multi.py
+python3 ./test.py $1 -s && sleep 1
 
 # table
-python3.8 ./test.py $1 -f table/column_name.py
-python3.8 ./test.py $1 -s && sleep 1
-python3.8 ./test.py $1 -f table/column_num.py
-python3.8 ./test.py $1 -s && sleep 1
-python3.8 ./test.py $1 -f table/db_table.py
-python3.8 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f table/column_name.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f table/column_num.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f table/db_table.py
+python3 ./test.py $1 -s && sleep 1
 
 # import
-python3.8 ./test.py $1 -f import_merge/importDataLastSub.py
-python3.8 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importDataLastSub.py
+python3 ./test.py $1 -s && sleep 1
 
 #tag 
-python3.8 ./test.py $1 -f tag_lite/filter.py
-python3.8 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f tag_lite/filter.py
+python3 ./test.py $1 -s && sleep 1
 
 #query
-python3.8 ./test.py $1 -f query/filter.py
-python3.8 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f query/filter.py
+python3 ./test.py $1 -s && sleep 1
 
 # client
-python3.8 ./test.py $1 -f client/client.py
-python3.8 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f client/client.py
+python3 ./test.py $1 -s && sleep 1
 
 # connector
-python3.8 ./test.py $1 -f connector/lua.py
+python3 ./test.py $1 -f connector/lua.py
diff --git a/tests/pytest/stream/table_1.py b/tests/pytest/stream/table_1.py
index a9fd57393112177fe0e290cadeaabd97d669daca..b205491fad181a51c991c16da65baa8370174e74 100644
--- a/tests/pytest/stream/table_1.py
+++ b/tests/pytest/stream/table_1.py
@@ -51,7 +51,7 @@ class TDTestCase:
                 tdSql.execute(
                     "insert into tb%d values (now - %dm, %d, %d)" %
                     (i, 1440 - j, j, j))
-        time.sleep(0.1)
+        time.sleep(1)
 
         self.createFuncStream("count(*)", "c1", rowNum)
         self.createFuncStream("count(tbcol)", "c2", rowNum)
diff --git a/tests/pytest/tag_lite/3.py b/tests/pytest/tag_lite/3.py
index 373db1c70fcc67eec7f4abae4e6264cad7fddf64..bbdf0868fae6d465525dbe7191172b4145b53f80 100644
--- a/tests/pytest/tag_lite/3.py
+++ b/tests/pytest/tag_lite/3.py
@@ -60,14 +60,14 @@ class TDTestCase:
 
             x = 0
             while (x < rowNum):
-                ms = "%dm" % x
-        # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
+        # TSIM: sql insert into $tb values (1605045600000 + $ms , $x )
                 tdLog.info(
-                    "insert into %s values (now + %s, %d)" %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    "insert into %s values (now + %s, %d)" %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 x = x + 1
         # TSIM: endw
             i = i + 1
@@ -81,13 +81,13 @@ class TDTestCase:
                 (tb, mt))
             x = 0
             while (x < rowNum):
-                ms = "%dm" % x
+                ms = x * 60000
                 tdLog.info(
-                    "insert into %s values (now + %s, %d)" %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    "insert into %s values (now + %s, %d)" %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 x = x + 1
         # TSIM: endw
             i = i + 1
@@ -104,36 +104,36 @@ class TDTestCase:
         # TSIM: return -1
         # TSIM: endi
         # TSIM:
-        # TSIM: sql select * from %s where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % mt)
-        tdSql.query('select * from %s where ts < now + 4m' % mt)
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % mt)
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % mt)
         # TSIM: if $rows != 50 then
         tdLog.info('tdSql.checkRow(50)')
         tdSql.checkRows(50)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % mt)
-        tdSql.query('select * from %s where ts > now + 4m' % mt)
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % mt)
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % mt)
         # TSIM: if $rows != 150 then
         tdLog.info('tdSql.checkRow(150)')
         tdSql.checkRows(150)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts = now + 4m
-        tdLog.info('select * from %s where ts = now + 4m' % mt)
-        tdSql.query('select * from %s where ts = now + 4m' % mt)
+        # TSIM: sql select * from %s where ts = 1605045600000 + 240001
+        tdLog.info('select * from %s where ts = 1605045600000 + 240001' % mt)
+        tdSql.query('select * from %s where ts = 1605045600000 + 240001' % mt)
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             mt)
         tdLog.info('tdSql.checkRow(10)')
         tdSql.checkRows(10)
@@ -267,91 +267,91 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step6
         tdLog.info('=============== step6')
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol1 = true
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol1 = true
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol1 = true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 = true' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol1 = true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 = true' %
             mt)
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> true
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> true
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol1 <> true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> true' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol1 <> true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> true' %
             mt)
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol1 = false
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol1 = false
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol1 = false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 = false' %
             mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol1 = false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 = false' %
             mt)
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol1 <> false
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol1 <> false
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol1 <> false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 <> false' %
             mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol1 <> false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 <> false' %
             mt)
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 = false
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol1 = false
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol1 = false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 = false' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol1 = false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 = false' %
             mt)
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 <> false
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol1 <> false
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol1 <> false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 <> false' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol1 <> false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 <> false' %
             mt)
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol1 <> false
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> false' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol1 <> false' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> false' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol1 <> false' %
             mt)
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> false
-        # and ts < now + 5m
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> false
+        # and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol1 <> false and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> false and ts < 1605045600000 + 300001' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol1 <> false and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> false and ts < 1605045600000 + 300001' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -361,84 +361,84 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step7
         tdLog.info('=============== step7')
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol2 = 1
-        tdLog.info('select * from %s where ts > now + 4m and tgcol2 = 1' % mt)
-        tdSql.query('select * from %s where ts > now + 4m and tgcol2 = 1' % mt)
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1' % mt)
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1' % mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 1
-        tdLog.info('select * from %s where ts > now + 4m and tgcol2 <> 1' % mt)
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1' % mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol2 = 0
-        tdLog.info('select * from %s where ts < now + 4m and tgcol2 = 0' % mt)
-        tdSql.query('select * from %s where ts < now + 4m and tgcol2 = 0' % mt)
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0' % mt)
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0' % mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol2 <> 0
-        tdLog.info('select * from %s where ts < now + 4m and tgcol2 <> 0' % mt)
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0' % mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 = 0
-        tdLog.info('select * from %s where ts <= now + 4m and tgcol2 = 0' % mt)
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0
+        tdLog.info('select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0' % mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 <> 0
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> 0' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 0 and ts
-        # < now + 5m
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts
+        # < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts < 1605045600000 + 300001' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts < 1605045600000 + 300001' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -448,84 +448,84 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step8
         tdLog.info('=============== step8')
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 = 1
-        tdLog.info('select * from %s where ts > now + 4m and tgcol3 = 1' % mt)
-        tdSql.query('select * from %s where ts > now + 4m and tgcol3 = 1' % mt)
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1' % mt)
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1' % mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1
-        tdLog.info('select * from %s where ts > now + 4m and tgcol3 <> 1' % mt)
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1' % mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0
-        tdLog.info('select * from %s where ts < now + 4m and tgcol3 = 0' % mt)
-        tdSql.query('select * from %s where ts < now + 4m and tgcol3 = 0' % mt)
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0' % mt)
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0' % mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0
-        tdLog.info('select * from %s where ts < now + 4m and tgcol3 <> 0' % mt)
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0' % mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol3 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0
-        tdLog.info('select * from %s where ts <= now + 4m and tgcol3 = 0' % mt)
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0
+        tdLog.info('select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0' % mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts
-        # < now + 5m
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts
+        # < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -535,104 +535,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step9
         tdLog.info('=============== step9')
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol2 = 1 and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1 and
         # tgcol1 = true
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 = 1 and tgcol1 = true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1 and tgcol1 = true' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 = 1 and tgcol1 = true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1 and tgcol1 = true' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 1 and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1 and
         # tgcol1 <> true
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1 and tgcol1 <> true' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1 and tgcol1 <> true' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol2 = 0 and
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0 and
         # tgcol1 = false
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 = 0 and tgcol1 = false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0 and tgcol1 = false' %
             mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 = 0 and tgcol1 = false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0 and tgcol1 = false' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol2 <> 0 and
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0 and
         # tgcol1 <> false
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0 and tgcol1 <> false' %
             mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0 and tgcol1 <> false' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 = 0 and
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0 and
         # tgcol1 = false
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 = 0 and tgcol1 = false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0 and tgcol1 = false' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 = 0 and tgcol1 = false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0 and tgcol1 = false' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 <> 0 and
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0 and
         # tgcol1 <> false
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0 and tgcol1 <> false' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0 and tgcol1 <> false' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol2 <> 0 and tgcol1 <> false
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> false' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> 0 and tgcol1 <> false' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> false' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> 0 and tgcol1 <> false' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 0 and ts
-        # < now + 5m and ts < now + 5m and tgcol1 <> false
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts
+        # < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol1 <> false
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> false' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol1 <> false' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> false' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol1 <> false' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -642,104 +642,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step10
         tdLog.info('=============== step10')
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 = 1 and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1 and
         # tgcol1 = true
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol1 = true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1 and tgcol1 = true' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol1 = true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1 and tgcol1 = true' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1 and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1 and
         # tgcol1 <> true
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol1 <> true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1 and tgcol1 <> true' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol1 <> true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1 and tgcol1 <> true' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0 and
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0 and
         # tgcol1 = false
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol1 = false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0 and tgcol1 = false' %
             mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol1 = false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0 and tgcol1 = false' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0 and
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0 and
         # tgcol1 <> false
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol1 <> false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0 and tgcol1 <> false' %
             mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol1 <> false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0 and tgcol1 <> false' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0 and
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0 and
         # tgcol1 = false
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol1 = false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0 and tgcol1 = false' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol1 = false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0 and tgcol1 = false' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0 and
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and
         # tgcol1 <> false
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol1 <> false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and tgcol1 <> false' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol1 <> false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and tgcol1 <> false' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol3 <> 0 and tgcol1 <> false
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol1 <> false' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0 and tgcol1 <> false' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol1 <> false' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0 and tgcol1 <> false' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts
-        # < now + 5m and ts < now + 5m and tgcol1 <> false
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts
+        # < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol1 <> false
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> false' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol1 <> false' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> false' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol1 <> false' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -749,104 +749,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step11
         tdLog.info('=============== step11')
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 = 1 and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1 and
         # tgcol2 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1 and tgcol2 = 1' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1 and tgcol2 = 1' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1 and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1 and
         # tgcol2 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1 and tgcol2 <> 1' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1 and tgcol2 <> 1' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0 and
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0 and
         # tgcol2 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0 and tgcol2 = 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0 and tgcol2 = 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0 and
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0 and
         # tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0 and tgcol2 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0 and tgcol2 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0 and
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0 and
         # tgcol2 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0 and tgcol2 = 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0 and tgcol2 = 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0 and
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and
         # tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and tgcol2 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and tgcol2 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol3 <> 0 and tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0 and tgcol2 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0 and tgcol2 <> 0' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts
-        # < now + 5m and ts < now + 5m and tgcol2 <> 0
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts
+        # < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -856,104 +856,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step12
         tdLog.info('=============== step12')
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol1 = 1 and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol1 = 1 and
         # tgcol2 = 1 and tgcol3 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> 1 and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 1 and
         # tgcol2 <> 1  and tgcol3 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol1 = 0 and
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol1 = 0 and
         # tgcol2 = 0 and tgcol3 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol1 <> 0 and
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol1 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 = 0 and
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol1 = 0 and
         # tgcol2 = 0 and tgcol3 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 <> 0 and
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol1 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> 0 and ts
-        # < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 0 and ts
+        # < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -1034,12 +1034,12 @@ class TDTestCase:
         # TSIM: print =============== step15
         tdLog.info('=============== step15')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             mt)
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             mt)
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -1050,13 +1050,13 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and
         # tgcol1 = true
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = true' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = true' %
             mt)
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = true' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = true' %
             mt)
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -1067,13 +1067,13 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and
         # tgcol1 = true and tgcol2 = 1
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = true and tgcol2 = 1' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = true and tgcol2 = 1' %
             mt)
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = true and tgcol2 = 1' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = true and tgcol2 = 1' %
             mt)
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -1084,11 +1084,11 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and
         # tgcol1 = true and tgcol2 = 1 and tgcol3 = 1
-        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = true and tgcol2 = 1 and tgcol3 = 1' % mt)
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = true and tgcol2 = 1 and tgcol3 = 1' % mt)
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = true and tgcol2 = 1 and tgcol3 = 1' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = true and tgcol2 = 1 and tgcol3 = 1' %
             mt)
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -1204,13 +1204,13 @@ class TDTestCase:
         # TSIM: print =============== step18
         tdLog.info('=============== step18')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001
         # group by tgcol2
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol2' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol2' %
             mt)
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol2' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol2' %
             mt)
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -1221,13 +1221,13 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and
         # tgcol1 = true group by tgcol2
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = true group by tgcol2' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = true group by tgcol2' %
             mt)
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = true group by tgcol2' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = true group by tgcol2' %
             mt)
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -1238,11 +1238,11 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and
         # tgcol1 = true and tgcol2 = 1  group by tgcol2
-        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = true and tgcol2 = 1  group by tgcol2' % mt)
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = true and tgcol2 = 1  group by tgcol2' % mt)
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = true and tgcol2 = 1  group by tgcol2' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = true and tgcol2 = 1  group by tgcol2' %
             mt)
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -1253,10 +1253,10 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and
         # tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 group by tgcol2
-        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 group by tgcol2' % mt)
-        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 group by tgcol2' % mt)
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 group by tgcol2' % mt)
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 group by tgcol2' % mt)
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
         # TSIM: if $data00 != 25 then
diff --git a/tests/pytest/tag_lite/4.py b/tests/pytest/tag_lite/4.py
index aae930ecdf67c04040c47115daad3e2b662915e9..df81dd81000c0698ea4ab1fb661d3b7f55059fbb 100644
--- a/tests/pytest/tag_lite/4.py
+++ b/tests/pytest/tag_lite/4.py
@@ -64,14 +64,14 @@ class TDTestCase:
                 (tb, mt))
             x = 0
             while (x < rowNum):
-                ms = "%dm" % x
-        # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
+        # TSIM: sql insert into $tb values (1605045600000 + $ms , $x )
                 tdLog.info(
-                    "insert into %s values (now + %s, %d)" %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    "insert into %s values (now + %s, %d)" %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 x = x + 1
         # TSIM: endw
             i = i + 1
@@ -87,14 +87,13 @@ class TDTestCase:
                 (tb, mt))
             x = 0
             while (x < rowNum):
-                ms = "%dm" % x
-        # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    "insert into %s values (now + %s, %d)" %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    "insert into %s values (now + %s, %d)" %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 x = x + 1
         # TSIM: endw
             i = i + 1
@@ -111,36 +110,36 @@ class TDTestCase:
         # TSIM: return -1
         # TSIM: endi
         # TSIM:
-        # TSIM: sql select * from %s where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % mt)
-        tdSql.query('select * from %s where ts < now + 4m' % mt)
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % mt)
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % mt)
         # TSIM: if $rows != 50 then
         tdLog.info('tdSql.checkRow(50)')
         tdSql.checkRows(50)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % mt)
-        tdSql.query('select * from %s where ts > now + 4m' % mt)
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % mt)
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % mt)
         # TSIM: if $rows != 150 then
         tdLog.info('tdSql.checkRow(150)')
         tdSql.checkRows(150)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts = now + 4m
-        tdLog.info('select * from %s where ts = now + 4m' % mt)
-        tdSql.query('select * from %s where ts = now + 4m' % mt)
+        # TSIM: sql select * from %s where ts = 1605045600000 + 240001
+        tdLog.info('select * from %s where ts = 1605045600000 + 240001' % mt)
+        tdSql.query('select * from %s where ts = 1605045600000 + 240001' % mt)
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             mt)
         # TSIM: if $rows != 10 then
         tdLog.info('tdSql.checkRow(10)')
@@ -322,84 +321,84 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step7
         tdLog.info('=============== step7')
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol1 = 1
-        tdLog.info('select * from %s where ts > now + 4m and tgcol1 = 1' % mt)
-        tdSql.query('select * from %s where ts > now + 4m and tgcol1 = 1' % mt)
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol1 = 1
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001 and tgcol1 = 1' % mt)
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001 and tgcol1 = 1' % mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> 1
-        tdLog.info('select * from %s where ts > now + 4m and tgcol1 <> 1' % mt)
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 1
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 1' % mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol1 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 1' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol1 = 0
-        tdLog.info('select * from %s where ts < now + 4m and tgcol1 = 0' % mt)
-        tdSql.query('select * from %s where ts < now + 4m and tgcol1 = 0' % mt)
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol1 = 0
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001 and tgcol1 = 0' % mt)
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001 and tgcol1 = 0' % mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol1 <> 0
-        tdLog.info('select * from %s where ts < now + 4m and tgcol1 <> 0' % mt)
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol1 <> 0
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001 and tgcol1 <> 0' % mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol1 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 = 0
-        tdLog.info('select * from %s where ts <= now + 4m and tgcol1 = 0' % mt)
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol1 = 0
+        tdLog.info('select * from %s where ts <= 1605045600000 + 240001 and tgcol1 = 0' % mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol1 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 = 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 <> 0
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol1 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol1 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol1 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol1 <> 0' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> 0 and ts
-        # < now + 5m
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 0 and ts
+        # < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 0 and ts < 1605045600000 + 300001' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 0 and ts < 1605045600000 + 300001' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -409,84 +408,84 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step8
         tdLog.info('=============== step8')
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol2 = 1
-        tdLog.info('select * from %s where ts > now + 4m and tgcol2 = 1' % mt)
-        tdSql.query('select * from %s where ts > now + 4m and tgcol2 = 1' % mt)
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1' % mt)
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1' % mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 1
-        tdLog.info('select * from %s where ts > now + 4m and tgcol2 <> 1' % mt)
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1' % mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol2 = 0
-        tdLog.info('select * from %s where ts < now + 4m and tgcol2 = 0' % mt)
-        tdSql.query('select * from %s where ts < now + 4m and tgcol2 = 0' % mt)
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0' % mt)
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0' % mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol2 <> 0
-        tdLog.info('select * from %s where ts < now + 4m and tgcol2 <> 0' % mt)
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0' % mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 = 0
-        tdLog.info('select * from %s where ts <= now + 4m and tgcol2 = 0' % mt)
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0
+        tdLog.info('select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0' % mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 <> 0
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> 0' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 0 and ts
-        # < now + 5m
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts
+        # < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts < 1605045600000 + 300001' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts < 1605045600000 + 300001' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -496,84 +495,84 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step9
         tdLog.info('=============== step9')
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 = 1
-        tdLog.info('select * from %s where ts > now + 4m and tgcol3 = 1' % mt)
-        tdSql.query('select * from %s where ts > now + 4m and tgcol3 = 1' % mt)
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1' % mt)
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1' % mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1
-        tdLog.info('select * from %s where ts > now + 4m and tgcol3 <> 1' % mt)
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1' % mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0
-        tdLog.info('select * from %s where ts < now + 4m and tgcol3 = 0' % mt)
-        tdSql.query('select * from %s where ts < now + 4m and tgcol3 = 0' % mt)
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0' % mt)
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0' % mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0
-        tdLog.info('select * from %s where ts < now + 4m and tgcol3 <> 0' % mt)
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0' % mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol3 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0
-        tdLog.info('select * from %s where ts <= now + 4m and tgcol3 = 0' % mt)
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0
+        tdLog.info('select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0' % mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts
-        # < now + 5m
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts
+        # < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -583,84 +582,84 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step10
         tdLog.info('=============== step10')
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol4 = 1
-        tdLog.info('select * from %s where ts > now + 4m and tgcol4 = 1' % mt)
-        tdSql.query('select * from %s where ts > now + 4m and tgcol4 = 1' % mt)
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1' % mt)
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1' % mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol4 <> 1
-        tdLog.info('select * from %s where ts > now + 4m and tgcol4 <> 1' % mt)
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1' % mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol4 = 0
-        tdLog.info('select * from %s where ts < now + 4m and tgcol4 = 0' % mt)
-        tdSql.query('select * from %s where ts < now + 4m and tgcol4 = 0' % mt)
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0' % mt)
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0' % mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol4 <> 0
-        tdLog.info('select * from %s where ts < now + 4m and tgcol4 <> 0' % mt)
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0' % mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol4 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol4 = 0
-        tdLog.info('select * from %s where ts <= now + 4m and tgcol4 = 0' % mt)
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0
+        tdLog.info('select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0' % mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol4 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol4 <> 0
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol4 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol4 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol4 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol4 <> 0' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol4 <> 0 and ts
-        # < now + 5m
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts
+        # < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts < 1605045600000 + 300001' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts < 1605045600000 + 300001' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -670,104 +669,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step11
         tdLog.info('=============== step11')
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol2 = 1 and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1 and
         # tgcol1 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 = 1 and tgcol1 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1 and tgcol1 = 1' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 = 1 and tgcol1 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1 and tgcol1 = 1' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 1 and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1 and
         # tgcol1 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1 and tgcol1 <> 1' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1 and tgcol1 <> 1' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol2 = 0 and
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0 and
         # tgcol1 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 = 0 and tgcol1 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0 and tgcol1 = 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 = 0 and tgcol1 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0 and tgcol1 = 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol2 <> 0 and
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0 and
         # tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0 and tgcol1 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0 and tgcol1 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 = 0 and
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0 and
         # tgcol1 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 = 0 and tgcol1 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0 and tgcol1 = 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 = 0 and tgcol1 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0 and tgcol1 = 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 <> 0 and
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0 and
         # tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0 and tgcol1 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0 and tgcol1 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol2 <> 0 and tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> 0 and tgcol1 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> 0 and tgcol1 <> 0' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 0 and ts
-        # < now + 5m and ts < now + 5m and tgcol1 <> 0
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts
+        # < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol1 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol1 <> 0' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -777,104 +776,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step12
         tdLog.info('=============== step12')
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 = 1 and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1 and
         # tgcol1 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol1 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1 and tgcol1 = 1' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol1 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1 and tgcol1 = 1' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1 and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1 and
         # tgcol1 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol1 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1 and tgcol1 <> 1' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol1 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1 and tgcol1 <> 1' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0 and
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0 and
         # tgcol1 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol1 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0 and tgcol1 = 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol1 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0 and tgcol1 = 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0 and
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0 and
         # tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0 and tgcol1 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0 and tgcol1 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0 and
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0 and
         # tgcol1 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol1 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0 and tgcol1 = 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol1 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0 and tgcol1 = 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0 and
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and
         # tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and tgcol1 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and tgcol1 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol3 <> 0 and tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0 and tgcol1 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0 and tgcol1 <> 0' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts
-        # < now + 5m and ts < now + 5m and tgcol1 <> 0
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts
+        # < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol1 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol1 <> 0' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -884,104 +883,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step13
         tdLog.info('=============== step13')
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 = 1 and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1 and
         # tgcol2 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1 and tgcol2 = 1' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1 and tgcol2 = 1' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1 and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1 and
         # tgcol2 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1 and tgcol2 <> 1' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1 and tgcol2 <> 1' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0 and
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0 and
         # tgcol2 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0 and tgcol2 = 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0 and tgcol2 = 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0 and
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0 and
         # tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0 and tgcol2 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0 and tgcol2 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0 and
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0 and
         # tgcol2 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0 and tgcol2 = 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0 and tgcol2 = 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0 and
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and
         # tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and tgcol2 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and tgcol2 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol3 <> 0 and tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0 and tgcol2 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0 and tgcol2 <> 0' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts
-        # < now + 5m and ts < now + 5m and tgcol2 <> 0
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts
+        # < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -991,104 +990,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step14
         tdLog.info('=============== step14')
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 = 1 and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1 and
         # tgcol4 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol4 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1 and tgcol4 = 1' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol4 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1 and tgcol4 = 1' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1 and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1 and
         # tgcol4 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol4 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1 and tgcol4 <> 1' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol4 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1 and tgcol4 <> 1' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0 and
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0 and
         # tgcol4 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol4 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0 and tgcol4 = 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol4 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0 and tgcol4 = 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0 and
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0 and
         # tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0 and tgcol4 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0 and tgcol4 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0 and
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0 and
         # tgcol4 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol4 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0 and tgcol4 = 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol4 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0 and tgcol4 = 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0 and
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and
         # tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and tgcol4 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and tgcol4 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol3 <> 0 and tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0 and tgcol4 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0 and tgcol4 <> 0' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts
-        # < now + 5m and ts < now + 5m and tgcol4 <> 0
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts
+        # < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol4 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol4 <> 0' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -1098,104 +1097,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step15
         tdLog.info('=============== step15')
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol1 = 1 and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol1 = 1 and
         # tgcol2 = 1 and tgcol3 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> 1 and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 1 and
         # tgcol2 <> 1  and tgcol3 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol1 = 0 and
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol1 = 0 and
         # tgcol2 = 0 and tgcol3 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol1 <> 0 and
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol1 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 = 0 and
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol1 = 0 and
         # tgcol2 = 0 and tgcol3 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 <> 0 and
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol1 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> 0 and ts
-        # < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 0 and ts
+        # < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -1205,104 +1204,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step16
         tdLog.info('=============== step16')
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol4 = 1 and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1 and
         # tgcol2 = 1 and tgcol3 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol4 <> 1 and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1 and
         # tgcol2 <> 1  and tgcol3 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol4 = 0 and
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0 and
         # tgcol2 = 0 and tgcol3 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol4 <> 0 and
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol4 = 0 and
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0 and
         # tgcol2 = 0 and tgcol3 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol4 <> 0 and
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol4 <> 0 and ts
-        # < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts
+        # < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -1312,105 +1311,105 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step17
         tdLog.info('=============== step17')
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol4 = 1 and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1 and
         # tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol4 <> 1 and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1 and
         # tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1' %
             mt)
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol4 = 0 and
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0 and
         # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts < now + 4m and tgcol4 <> 0 and
+        # TSIM: sql select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol4 = 0 and
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0 and
         # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts <= now + 4m and tgcol4 <> 0 and
+        # TSIM: sql select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
             mt)
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from %s where ts > now + 4m and tgcol4 <> 0 and ts
-        # < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and
+        # TSIM: sql select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts
+        # < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0 and
         # tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
             mt)
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
             mt)
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -1508,12 +1507,12 @@ class TDTestCase:
         # TSIM: print =============== step20
         tdLog.info('=============== step20')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             mt)
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             mt)
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -1524,13 +1523,13 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and
         # tgcol1 = 1
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1' %
             mt)
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1' %
             mt)
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -1541,13 +1540,13 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and
         # tgcol1 = 1 and tgcol2 = 1
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1' %
             mt)
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1' %
             mt)
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -1558,13 +1557,13 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and
         # tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
             mt)
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
             mt)
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -1575,10 +1574,10 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and
         # tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1
-        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1' % mt)
-        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1' % mt)
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1' % mt)
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1' % mt)
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
         # TSIM: if $data00 != 25 then
@@ -1722,13 +1721,13 @@ class TDTestCase:
         # TSIM: print =============== step23
         tdLog.info('=============== step23')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001
         # group by tgcol2
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol2' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol2' %
             mt)
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol2' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol2' %
             mt)
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -1739,13 +1738,13 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and
         # tgcol1 = 1 group by tgcol2
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 group by tgcol2' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 group by tgcol2' %
             mt)
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 group by tgcol2' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 group by tgcol2' %
             mt)
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -1756,11 +1755,11 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and
         # tgcol1 = 1 and tgcol2 = 1  group by tgcol2
-        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1  group by tgcol2' % mt)
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1  group by tgcol2' % mt)
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1  group by tgcol2' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1  group by tgcol2' %
             mt)
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -1771,10 +1770,10 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and
         # tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2
-        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2' % mt)
-        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2' % mt)
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2' % mt)
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2' % mt)
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
         # TSIM: if $data00 != 25 then
@@ -1784,11 +1783,11 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and
         # tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by
         # tgcol2
-        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2' % mt)
-        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2' % mt)
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2' % mt)
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2' % mt)
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
         # TSIM: if $data00 != 25 then
diff --git a/tests/pytest/tag_lite/5.py b/tests/pytest/tag_lite/5.py
index b3608bebee649b38b0d1315cc1cb97a43d5365e6..28c8fc125a9c9f27230e63494e9d7f57c5505154 100644
--- a/tests/pytest/tag_lite/5.py
+++ b/tests/pytest/tag_lite/5.py
@@ -76,14 +76,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s, %d)' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s, %d)' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -105,14 +104,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s, %d)' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s, %d)' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -131,36 +129,36 @@ class TDTestCase:
         # TSIM: return -1
         # TSIM: endi
         # TSIM:
-        # TSIM: sql select * from $mt where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (mt))
-        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 50 then
         tdLog.info('tdSql.checkRow(50)')
         tdSql.checkRows(50)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (mt))
-        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 150 then
         tdLog.info('tdSql.checkRow(150)')
         tdSql.checkRows(150)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts = now + 4m
-        tdLog.info('select * from %s where ts = now + 4m' % (mt))
-        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts = 1605045600000 + 240001
+        tdLog.info('select * from %s where ts = 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts = 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 10 then
         tdLog.info('tdSql.checkRow(10)')
@@ -377,98 +375,98 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step8
         tdLog.info('=============== step8')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 = 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol1 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol1 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol1 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol1 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol1 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol1 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 = 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol1 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol1 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol1 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol1 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol1 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol1 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol1 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol1 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol1 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol1 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol1 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol1 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and
-        # ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol1 <> 0 and
+        # ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -478,98 +476,98 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step9
         tdLog.info('=============== step9')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and
-        # ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> 0 and
+        # ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -579,98 +577,98 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step10
         tdLog.info('=============== step10')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 = 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol3 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol3 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 = 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol3 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol3 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol3 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol3 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol3 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol3 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol3 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and
-        # ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol3 <> 0 and
+        # ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -680,98 +678,98 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step11
         tdLog.info('=============== step11')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 = 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol4 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol4 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol4 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol4 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol4 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol4 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol4 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol4 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol4 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol4 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol4 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol4 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and
-        # ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 <> 0 and
+        # ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -781,98 +779,98 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step12
         tdLog.info('=============== step12')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 = 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol5 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol5 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol5 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol5 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol5 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol5 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 = 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol5 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol5 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol5 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol5 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol5 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol5 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol5 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol5 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol5 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol5 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol5 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol5 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol5 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol5 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol5 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol5 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol5 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol5 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol5 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol5 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol5 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol5 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol5 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol5 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol5 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and
-        # ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol5 <> 0 and
+        # ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -882,104 +880,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step13
         tdLog.info('=============== step13')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 = 1 and
         # tgcol1 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 = 1 and tgcol1 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1 and tgcol1 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 = 1 and tgcol1 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1 and tgcol1 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> 1 and
         # tgcol1 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1 and tgcol1 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1 and tgcol1 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 = 0 and
         # tgcol1 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 = 0 and tgcol1 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0 and tgcol1 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 = 0 and tgcol1 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0 and tgcol1 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 <> 0 and
         # tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0 and tgcol1 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0 and tgcol1 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 = 0 and
         # tgcol1 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 = 0 and tgcol1 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0 and tgcol1 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 = 0 and tgcol1 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0 and tgcol1 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 <> 0 and
         # tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0 and tgcol1 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0 and tgcol1 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol2 <> 0 and tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> 0 and tgcol1 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> 0 and tgcol1 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and
-        # ts < now + 5m and ts < now + 5m and tgcol1 <> 0
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> 0 and
+        # ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol1 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol1 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -989,104 +987,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step14
         tdLog.info('=============== step14')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 = 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol3 = 1 and
         # tgcol2 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1 and tgcol2 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1 and tgcol2 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol3 <> 1 and
         # tgcol2 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1 and tgcol2 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1 and tgcol2 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 = 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol3 = 0 and
         # tgcol2 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0 and tgcol2 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0 and tgcol2 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol3 <> 0 and
         # tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0 and tgcol2 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0 and tgcol2 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol3 = 0 and
         # tgcol2 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0 and tgcol2 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0 and tgcol2 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and
         # tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and tgcol2 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and tgcol2 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol3 <> 0 and tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0 and tgcol2 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0 and tgcol2 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and
-        # ts < now + 5m and ts < now + 5m and tgcol2 <> 0
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol3 <> 0 and
+        # ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -1096,104 +1094,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step15
         tdLog.info('=============== step15')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 = 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol3 = 1 and
         # tgcol4 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol4 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1 and tgcol4 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol4 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1 and tgcol4 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol3 <> 1 and
         # tgcol4 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol4 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1 and tgcol4 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol4 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1 and tgcol4 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 = 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol3 = 0 and
         # tgcol4 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol4 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0 and tgcol4 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol4 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0 and tgcol4 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol3 <> 0 and
         # tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0 and tgcol4 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0 and tgcol4 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol3 = 0 and
         # tgcol4 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol4 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0 and tgcol4 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol4 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0 and tgcol4 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and
         # tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and tgcol4 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and tgcol4 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol3 <> 0 and tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0 and tgcol4 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0 and tgcol4 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and
-        # ts < now + 5m and ts < now + 5m and tgcol4 <> 0
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol3 <> 0 and
+        # ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol4 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol4 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -1203,104 +1201,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step16
         tdLog.info('=============== step16')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 = 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol5 = 1 and
         # tgcol4 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol5 = 1 and tgcol4 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 = 1 and tgcol4 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol5 = 1 and tgcol4 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 = 1 and tgcol4 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol5 <> 1 and
         # tgcol4 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol5 <> 1 and tgcol4 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 <> 1 and tgcol4 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol5 <> 1 and tgcol4 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 <> 1 and tgcol4 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 = 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol5 = 0 and
         # tgcol4 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol5 = 0 and tgcol4 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol5 = 0 and tgcol4 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol5 = 0 and tgcol4 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol5 = 0 and tgcol4 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 <> 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol5 <> 0 and
         # tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol5 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol5 <> 0 and tgcol4 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol5 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol5 <> 0 and tgcol4 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 = 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol5 = 0 and
         # tgcol4 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol5 = 0 and tgcol4 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol5 = 0 and tgcol4 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol5 = 0 and tgcol4 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol5 = 0 and tgcol4 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol5 <> 0 and
         # tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol5 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol5 <> 0 and tgcol4 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol5 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol5 <> 0 and tgcol4 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol5 <> 0 and tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol5 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol5 <> 0 and tgcol4 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol5 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol5 <> 0 and tgcol4 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and
-        # ts < now + 5m and ts < now + 5m and tgcol4 <> 0
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol5 <> 0 and
+        # ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol4 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol4 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -1310,104 +1308,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step17
         tdLog.info('=============== step17')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 = 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol1 = 1 and
         # tgcol2 = 1 and tgcol3 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol1 <> 1 and
         # tgcol2 <> 1  and tgcol3 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 = 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol1 = 0 and
         # tgcol2 = 0 and tgcol3 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 <> 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol1 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 = 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol1 = 0 and
         # tgcol2 = 0 and tgcol3 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol1 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: 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
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol1 <> 0 and
+        # ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -1417,104 +1415,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step18
         tdLog.info('=============== step18')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 = 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 = 1 and
         # tgcol2 = 1 and tgcol3 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 <> 1 and
         # tgcol2 <> 1  and tgcol3 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol4 = 0 and
         # tgcol2 = 0 and tgcol3 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol4 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol4 = 0 and
         # tgcol2 = 0 and tgcol3 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: 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
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 <> 0 and
+        # ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -1524,105 +1522,105 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step19
         tdLog.info('=============== step19')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 = 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 = 1 and
         # tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 <> 1 and
         # tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol4 = 0 and
         # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol4 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol4 = 0 and
         # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: 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
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 <> 0 and
+        # ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0 and
         # tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -1632,106 +1630,106 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step20
         tdLog.info('=============== step20')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 = 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 = 1 and
         # tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 <> 1 and
         # tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol4 = 0 and
         # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol4 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol4 = 0 and
         # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and
         # tgcol5 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: 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
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 <> 0 and
+        # ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0 and tgcol3 <> 0 and
         # tgcol1 <> 0 and tgcol5 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -1844,12 +1842,12 @@ class TDTestCase:
         # TSIM: print =============== step23
         tdLog.info('=============== step23')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -1860,13 +1858,13 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # and tgcol1 = 1
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -1877,13 +1875,13 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # and tgcol1 = 1 and tgcol2 = 1
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -1894,13 +1892,13 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -1911,11 +1909,11 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1
-        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1' % (mt))
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1' % (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -1926,11 +1924,11 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and
         # tgcol5 = 1
-        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1' % (mt))
-        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1' % (mt))
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1' % (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
         # TSIM: if $data00 != 25 then
@@ -2106,13 +2104,13 @@ class TDTestCase:
         # TSIM: print =============== step26
         tdLog.info('=============== step26')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # group by tgcol2
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol2' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol2' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol2' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol2' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -2123,13 +2121,13 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # and tgcol1 = 1 group by tgcol2
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 group by tgcol2' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 group by tgcol2' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 group by tgcol2' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 group by tgcol2' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -2140,13 +2138,13 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # and tgcol1 = 1 and tgcol2 = 1  group by tgcol2
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1  group by tgcol2' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1  group by tgcol2' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1  group by tgcol2' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1  group by tgcol2' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -2157,11 +2155,11 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2
-        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2' % (mt))
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2' % (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -2172,11 +2170,11 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by
         # tgcol2
-        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2' % (mt))
-        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2' % (mt))
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2' % (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
         # TSIM: if $data00 != 25 then
@@ -2186,11 +2184,11 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and
         # tgcol5 = 1 group by tgcol2
-        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 group by tgcol2' % (mt))
-        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 group by tgcol2' % (mt))
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 group by tgcol2' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 group by tgcol2' % (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
         # TSIM: if $data00 != 25 then
diff --git a/tests/pytest/tag_lite/6.py b/tests/pytest/tag_lite/6.py
index b789e41794449e4ec97d03423bfcd03703f7604b..5cf43f10475181202eaa901d0a7ef1d1d23e86e0 100644
--- a/tests/pytest/tag_lite/6.py
+++ b/tests/pytest/tag_lite/6.py
@@ -79,14 +79,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -110,14 +109,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -136,36 +134,36 @@ class TDTestCase:
         # TSIM: return -1
         # TSIM: endi
         # TSIM:
-        # TSIM: sql select * from $mt where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (mt))
-        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 50 then
         tdLog.info('tdSql.checkRow(50)')
         tdSql.checkRows(50)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (mt))
-        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 150 then
         tdLog.info('tdSql.checkRow(150)')
         tdSql.checkRows(150)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts = now + 4m
-        tdLog.info('select * from %s where ts = now + 4m' % (mt))
-        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts = 1605045600000 + 240001
+        tdLog.info('select * from %s where ts = 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts = 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 10 then
         tdLog.info('tdSql.checkRow(10)')
@@ -417,98 +415,98 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step9
         tdLog.info('=============== step9')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 = 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol1 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol1 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol1 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol1 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol1 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol1 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 = 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol1 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol1 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol1 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol1 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol1 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol1 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol1 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol1 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol1 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol1 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol1 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol1 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and
-        # ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol1 <> 0 and
+        # ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -518,98 +516,98 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step10
         tdLog.info('=============== step10')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and
-        # ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> 0 and
+        # ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -619,98 +617,98 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step11
         tdLog.info('=============== step11')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 = 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol3 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol3 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 = 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol3 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol3 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol3 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol3 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol3 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol3 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol3 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and
-        # ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol3 <> 0 and
+        # ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -720,98 +718,98 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step12
         tdLog.info('=============== step12')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 = 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol4 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol4 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol4 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol4 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol4 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol4 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol4 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol4 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol4 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol4 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol4 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol4 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and
-        # ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 <> 0 and
+        # ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -821,98 +819,98 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step13
         tdLog.info('=============== step13')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 = 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol5 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol5 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol5 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol5 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol5 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol5 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 = 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol5 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol5 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol5 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol5 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol5 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol5 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol5 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol5 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol5 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol5 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol5 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol5 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol5 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol5 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol5 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol5 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol5 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol5 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol5 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol5 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol5 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol5 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol5 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol5 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol5 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and
-        # ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol5 <> 0 and
+        # ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -922,98 +920,98 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step14
         tdLog.info('=============== step14')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol6 = 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol6 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol6 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol6 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol6 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol6 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol6 <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol6 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol6 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol6 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol6 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol6 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol6 = 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol6 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol6 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol6 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol6 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol6 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol6 <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol6 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol6 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol6 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol6 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol6 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol6 = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol6 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol6 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol6 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol6 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol6 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol6 <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol6 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol6 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol6 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol6 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol6 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol6 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol6 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol6 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol6 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol6 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol6 <> 0 and
-        # ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol6 <> 0 and
+        # ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol6 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol6 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol6 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol6 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -1023,104 +1021,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step15
         tdLog.info('=============== step15')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 = 1 and
         # tgcol1 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 = 1 and tgcol1 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1 and tgcol1 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 = 1 and tgcol1 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1 and tgcol1 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> 1 and
         # tgcol1 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1 and tgcol1 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1 and tgcol1 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 = 0 and
         # tgcol1 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 = 0 and tgcol1 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0 and tgcol1 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 = 0 and tgcol1 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0 and tgcol1 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 <> 0 and
         # tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0 and tgcol1 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0 and tgcol1 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 = 0 and
         # tgcol1 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 = 0 and tgcol1 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0 and tgcol1 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 = 0 and tgcol1 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0 and tgcol1 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 <> 0 and
         # tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0 and tgcol1 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0 and tgcol1 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol2 <> 0 and tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> 0 and tgcol1 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> 0 and tgcol1 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and
-        # ts < now + 5m and ts < now + 5m and tgcol1 <> 0
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> 0 and
+        # ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol1 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol1 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -1130,104 +1128,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step16
         tdLog.info('=============== step16')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 = 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol3 = 1 and
         # tgcol2 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1 and tgcol2 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1 and tgcol2 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol3 <> 1 and
         # tgcol2 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1 and tgcol2 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1 and tgcol2 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 = 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol3 = 0 and
         # tgcol2 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0 and tgcol2 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0 and tgcol2 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol3 <> 0 and
         # tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0 and tgcol2 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0 and tgcol2 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol3 = 0 and
         # tgcol2 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0 and tgcol2 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0 and tgcol2 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and
         # tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and tgcol2 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and tgcol2 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol3 <> 0 and tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0 and tgcol2 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0 and tgcol2 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and
-        # ts < now + 5m and ts < now + 5m and tgcol2 <> 0
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol3 <> 0 and
+        # ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -1237,104 +1235,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step17
         tdLog.info('=============== step17')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 = 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol3 = 1 and
         # tgcol4 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol4 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1 and tgcol4 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol4 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 = 1 and tgcol4 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol3 <> 1 and
         # tgcol4 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol4 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1 and tgcol4 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol4 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 1 and tgcol4 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 = 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol3 = 0 and
         # tgcol4 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol4 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0 and tgcol4 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol4 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 = 0 and tgcol4 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol3 <> 0 and
         # tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0 and tgcol4 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol3 <> 0 and tgcol4 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol3 = 0 and
         # tgcol4 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol4 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0 and tgcol4 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol4 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 = 0 and tgcol4 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and
         # tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and tgcol4 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol3 <> 0 and tgcol4 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol3 <> 0 and tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0 and tgcol4 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol3 <> 0 and tgcol4 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and
-        # ts < now + 5m and ts < now + 5m and tgcol4 <> 0
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol3 <> 0 and
+        # ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol4 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol3 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol4 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -1344,104 +1342,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step18
         tdLog.info('=============== step18')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 = 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol5 = 1 and
         # tgcol4 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol5 = 1 and tgcol4 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 = 1 and tgcol4 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol5 = 1 and tgcol4 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 = 1 and tgcol4 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol5 <> 1 and
         # tgcol4 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol5 <> 1 and tgcol4 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 <> 1 and tgcol4 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol5 <> 1 and tgcol4 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 <> 1 and tgcol4 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 = 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol5 = 0 and
         # tgcol4 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol5 = 0 and tgcol4 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol5 = 0 and tgcol4 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol5 = 0 and tgcol4 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol5 = 0 and tgcol4 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 <> 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol5 <> 0 and
         # tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol5 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol5 <> 0 and tgcol4 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol5 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol5 <> 0 and tgcol4 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 = 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol5 = 0 and
         # tgcol4 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol5 = 0 and tgcol4 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol5 = 0 and tgcol4 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol5 = 0 and tgcol4 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol5 = 0 and tgcol4 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol5 <> 0 and
         # tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol5 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol5 <> 0 and tgcol4 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol5 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol5 <> 0 and tgcol4 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol5 <> 0 and tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol5 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol5 <> 0 and tgcol4 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol5 <> 0 and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol5 <> 0 and tgcol4 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and
-        # ts < now + 5m and ts < now + 5m and tgcol4 <> 0
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol5 <> 0 and
+        # ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol4 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol4 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol4 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -1451,104 +1449,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step19
         tdLog.info('=============== step19')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 = 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol5 = 1 and
         # tgcol6 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol5 = 1 and tgcol6 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 = 1 and tgcol6 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol5 = 1 and tgcol6 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 = 1 and tgcol6 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol5 <> 1 and
         # tgcol6 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol5 <> 1 and tgcol6 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 <> 1 and tgcol6 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol5 <> 1 and tgcol6 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 <> 1 and tgcol6 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 = 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol5 = 0 and
         # tgcol6 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol5 = 0 and tgcol6 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol5 = 0 and tgcol6 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol5 = 0 and tgcol6 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol5 = 0 and tgcol6 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 <> 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol5 <> 0 and
         # tgcol6 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol5 <> 0 and tgcol6 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol5 <> 0 and tgcol6 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol5 <> 0 and tgcol6 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol5 <> 0 and tgcol6 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 = 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol5 = 0 and
         # tgcol6 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol5 = 0 and tgcol6 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol5 = 0 and tgcol6 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol5 = 0 and tgcol6 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol5 = 0 and tgcol6 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol5 <> 0 and
         # tgcol6 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol5 <> 0 and tgcol6 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol5 <> 0 and tgcol6 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol5 <> 0 and tgcol6 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol5 <> 0 and tgcol6 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol5 <> 0 and tgcol6 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol5 <> 0 and tgcol6 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol5 <> 0 and tgcol6 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol5 <> 0 and tgcol6 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol5 <> 0 and tgcol6 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and
-        # ts < now + 5m and ts < now + 5m and tgcol6 <> 0
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol5 <> 0 and
+        # ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol6 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m and ts < now + 5m and tgcol6 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol6 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m and ts < now + 5m and tgcol6 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol5 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol6 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -1558,104 +1556,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step20
         tdLog.info('=============== step20')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 = 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol1 = 1 and
         # tgcol2 = 1 and tgcol3 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol1 <> 1 and
         # tgcol2 <> 1  and tgcol3 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 = 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol1 = 0 and
         # tgcol2 = 0 and tgcol3 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 <> 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol1 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 = 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol1 = 0 and
         # tgcol2 = 0 and tgcol3 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol1 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: 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
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol1 <> 0 and
+        # ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol1 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -1665,104 +1663,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step21
         tdLog.info('=============== step21')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 = 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 = 1 and
         # tgcol2 = 1 and tgcol3 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 <> 1 and
         # tgcol2 <> 1  and tgcol3 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol4 = 0 and
         # tgcol2 = 0 and tgcol3 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol4 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol4 = 0 and
         # tgcol2 = 0 and tgcol3 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: 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
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 <> 0 and
+        # ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -1772,105 +1770,105 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step22
         tdLog.info('=============== step22')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 = 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 = 1 and
         # tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 <> 1 and
         # tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol4 = 0 and
         # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol4 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol4 = 0 and
         # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: 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
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 <> 0 and
+        # ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0 and
         # tgcol1 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -1880,106 +1878,106 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step23
         tdLog.info('=============== step23')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 = 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 = 1 and
         # tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 <> 1 and
         # tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol4 = 0 and
         # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol4 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol4 = 0 and
         # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and
         # tgcol5 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: 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
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 <> 0 and
+        # ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0 and
         # tgcol1 <> 0 and tgcol5 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -1989,112 +1987,112 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step24
         tdLog.info('=============== step24')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 = 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 = 1 and
         # tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1 and tgcol6 =
         # 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1 and tgcol6 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1 and tgcol6 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1 and tgcol6 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1 and tgcol6 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 <> 1 and
         # tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1 and
         # tgcol6 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1 and tgcol6 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1 and tgcol6 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1 and tgcol6 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1 and tgcol6 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol4 = 0 and
         # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 =
         # 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol4 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and
         # tgcol6 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol4 = 0 and
         # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 =
         # 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and
         # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and
         # tgcol6 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and
         # tgcol5 <> 0 and tgcol6 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: 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
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol4 <> 0 and
+        # ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0 and
         # tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol4 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -2221,12 +2219,12 @@ class TDTestCase:
         # TSIM: print =============== step27
         tdLog.info('=============== step27')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -2237,13 +2235,13 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # and tgcol1 = 1
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -2254,13 +2252,13 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # and tgcol1 = 1 and tgcol2 = 1
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -2271,13 +2269,13 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -2288,11 +2286,11 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1
-        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1' % (mt))
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1' % (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -2303,11 +2301,11 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and
         # tgcol5 = 1
-        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1' % (mt))
-        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1' % (mt))
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1' % (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
         # TSIM: if $data00 != 25 then
@@ -2317,11 +2315,11 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and
         # tgcol5 = 1 and tgcol6 = 1
-        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1 and tgcol6 = 1' % (mt))
-        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1 and tgcol6 = 1' % (mt))
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1 and tgcol6 = 1' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1 and tgcol6 = 1' % (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
         # TSIM: if $data00 != 25 then
@@ -2527,13 +2525,13 @@ class TDTestCase:
         # TSIM: print =============== step30
         tdLog.info('=============== step30')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # group by tgcol2
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol2' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol2' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol2' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol2' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -2544,13 +2542,13 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # and tgcol1 = 1 group by tgcol2
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 group by tgcol2' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 group by tgcol2' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 group by tgcol2' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 group by tgcol2' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -2561,13 +2559,13 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # and tgcol1 = 1 and tgcol2 = 1  group by tgcol2
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1  group by tgcol2' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1  group by tgcol2' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1  group by tgcol2' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1  group by tgcol2' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -2578,11 +2576,11 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2
-        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2' % (mt))
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2' % (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -2593,11 +2591,11 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by
         # tgcol2
-        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2' % (mt))
-        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2' % (mt))
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2' % (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
         # TSIM: if $data00 != 25 then
@@ -2607,11 +2605,11 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and
         # tgcol5 = 1 group by tgcol2
-        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 group by tgcol2' % (mt))
-        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 group by tgcol2' % (mt))
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 group by tgcol2' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 group by tgcol2' % (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
         # TSIM: if $data00 != 25 then
@@ -2621,11 +2619,11 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and
         # tgcol5 = 1 and tgcol6 = 1 group by tgcol2
-        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 and tgcol6 = 1 group by tgcol2' % (mt))
-        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 and tgcol6 = 1 group by tgcol2' % (mt))
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 and tgcol6 = 1 group by tgcol2' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 and tgcol6 = 1 group by tgcol2' % (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
         # TSIM: if $data00 != 25 then
diff --git a/tests/pytest/tag_lite/bigint.py b/tests/pytest/tag_lite/bigint.py
index f83961aaad401f337a1dc4f0d305391f22006b9a..733d30983d07ab9e2c30076b76084edb354e289f 100644
--- a/tests/pytest/tag_lite/bigint.py
+++ b/tests/pytest/tag_lite/bigint.py
@@ -72,14 +72,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -98,14 +97,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -124,56 +122,56 @@ class TDTestCase:
         tdSql.checkRows(rowNum)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (tb))
-        tdSql.query('select * from %s where ts < now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts <= now + 4m
-        tdLog.info('select * from %s where ts <= now + 4m' % (tb))
-        tdSql.query('select * from %s where ts <= now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts <= 1605045600000 + 240001
+        tdLog.info('select * from %s where ts <= 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts <= 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (tb))
-        tdSql.query('select * from %s where ts > now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 15 then
         tdLog.info('tdSql.checkRow(15)')
         tdSql.checkRows(15)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts >= now + 4m
-        tdLog.info('select * from %s where ts >= now + 4m' % (tb))
-        tdSql.query('select * from %s where ts >= now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts >= 1605045600000 + 240001
+        tdLog.info('select * from %s where ts >= 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts >= 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 15 then
         tdLog.info('tdSql.checkRow(15)')
         tdSql.checkRows(15)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (tb))
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
         tdSql.checkRows(1)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m
+        # TSIM: sql select * from $tb where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            'select * from %s where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            'select * from %s where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001' %
             (tb))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
@@ -190,25 +188,25 @@ class TDTestCase:
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001' %
             (tb))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and
-        # ts < now + 6m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and
+        # ts < 1605045600000 + 360001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and ts < 1605045600000 + 360001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and ts < 1605045600000 + 360001' %
             (tb))
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
@@ -227,36 +225,36 @@ class TDTestCase:
         # TSIM: return -1
         # TSIM: endi
         # TSIM:
-        # TSIM: sql select * from $mt where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (mt))
-        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 50 then
         tdLog.info('tdSql.checkRow(50)')
         tdSql.checkRows(50)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (mt))
-        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 150 then
         tdLog.info('tdSql.checkRow(150)')
         tdSql.checkRows(150)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts = now + 4m
-        tdLog.info('select * from %s where ts = now + 4m' % (mt))
-        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts = 1605045600000 + 240001
+        tdLog.info('select * from %s where ts = 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts = 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 10 then
         tdLog.info('tdSql.checkRow(10)')
@@ -333,94 +331,94 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step5
         tdLog.info('=============== step5')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = 1
-        tdLog.info('select * from %s where ts > now + 4m and tgcol = 1' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol = 1
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001 and tgcol = 1' % (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0
-        tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol = 0
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001 and tgcol = 0' % (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts
-        # < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> 0 and ts
+        # < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -467,12 +465,12 @@ class TDTestCase:
         # TSIM: print =============== step8
         tdLog.info('=============== step8')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -522,13 +520,13 @@ class TDTestCase:
         # TSIM: print =============== step11
         tdLog.info('=============== step11')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # group by tgcol
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
diff --git a/tests/pytest/tag_lite/binary.py b/tests/pytest/tag_lite/binary.py
index 4cbae63bec1ec6a885f015a69bb4192e93cc9629..3825c6637f9357e00bc8491be1d8c2960dde2109 100644
--- a/tests/pytest/tag_lite/binary.py
+++ b/tests/pytest/tag_lite/binary.py
@@ -72,14 +72,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -98,14 +97,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -124,56 +122,56 @@ class TDTestCase:
         tdSql.checkRows(rowNum)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (tb))
-        tdSql.query('select * from %s where ts < now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts <= now + 4m
-        tdLog.info('select * from %s where ts <= now + 4m' % (tb))
-        tdSql.query('select * from %s where ts <= now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts <= 1605045600000 + 240001
+        tdLog.info('select * from %s where ts <= 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts <= 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (tb))
-        tdSql.query('select * from %s where ts > now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 15 then
         tdLog.info('tdSql.checkRow(15)')
         tdSql.checkRows(15)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts >= now + 4m
-        tdLog.info('select * from %s where ts >= now + 4m' % (tb))
-        tdSql.query('select * from %s where ts >= now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts >= 1605045600000 + 240001
+        tdLog.info('select * from %s where ts >= 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts >= 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 15 then
         tdLog.info('tdSql.checkRow(15)')
         tdSql.checkRows(15)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (tb))
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
         tdSql.checkRows(1)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m
+        # TSIM: sql select * from $tb where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            'select * from %s where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            'select * from %s where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001' %
             (tb))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
@@ -190,25 +188,25 @@ class TDTestCase:
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001' %
             (tb))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and
-        # ts < now + 6m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and
+        # ts < 1605045600000 + 360001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and ts < 1605045600000 + 360001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and ts < 1605045600000 + 360001' %
             (tb))
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
@@ -227,36 +225,36 @@ class TDTestCase:
         # TSIM: return -1
         # TSIM: endi
         # TSIM:
-        # TSIM: sql select * from $mt where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (mt))
-        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 50 then
         tdLog.info('tdSql.checkRow(50)')
         tdSql.checkRows(50)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (mt))
-        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 150 then
         tdLog.info('tdSql.checkRow(150)')
         tdSql.checkRows(150)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts = now + 4m
-        tdLog.info('select * from %s where ts = now + 4m' % (mt))
-        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts = 1605045600000 + 240001
+        tdLog.info('select * from %s where ts = 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts = 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 10 then
         tdLog.info('tdSql.checkRow(10)')
@@ -333,98 +331,98 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step5
         tdLog.info('=============== step5')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = '1'
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol = '1'
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol = "1"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol = "1"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol = "1"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol = "1"' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> '1'
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> '1'
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> "1"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> "1"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> "1"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> "1"' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = '0'
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol = '0'
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol = "0"' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol = "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol = "0"' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol = "0"' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> '0'
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol <> '0'
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol <> "0"' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol <> "0"' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> "0"' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = '0'
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol = '0'
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol = "0"' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol = "0"' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = "0"' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> '0'
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol <> '0'
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol <> "0"' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol <> "0"' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> "0"' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol <> '0'
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> "0"' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> "0"' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> "0"' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> '0' and
-        # ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> '0' and
+        # ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> "0" and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> "0" and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> "0" and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> "0" and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -471,12 +469,12 @@ class TDTestCase:
         # TSIM: print =============== step8
         tdLog.info('=============== step8')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -526,13 +524,13 @@ class TDTestCase:
         # TSIM: print =============== step11
         tdLog.info('=============== step11')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # group by tgcol
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
diff --git a/tests/pytest/tag_lite/binary_binary.py b/tests/pytest/tag_lite/binary_binary.py
index 9c789eafd655d76362d5bc4729fd4e5da8de2156..2a76238f595ce5b079f0d36453197875d214145c 100644
--- a/tests/pytest/tag_lite/binary_binary.py
+++ b/tests/pytest/tag_lite/binary_binary.py
@@ -74,14 +74,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -102,14 +101,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -128,36 +126,36 @@ class TDTestCase:
         # TSIM: return -1
         # TSIM: endi
         # TSIM:
-        # TSIM: sql select * from $mt where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (mt))
-        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 50 then
         tdLog.info('tdSql.checkRow(50)')
         tdSql.checkRows(50)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (mt))
-        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 150 then
         tdLog.info('tdSql.checkRow(150)')
         tdSql.checkRows(150)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts = now + 4m
-        tdLog.info('select * from %s where ts = now + 4m' % (mt))
-        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts = 1605045600000 + 240001
+        tdLog.info('select * from %s where ts = 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts = 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 10 then
         tdLog.info('tdSql.checkRow(10)')
@@ -269,98 +267,98 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step5
         tdLog.info('=============== step5')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = '1'
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol = '1'
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol = "1"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol = "1"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol = "1"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol = "1"' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> '1'
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> '1'
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> "1"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> "1"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> "1"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> "1"' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = '0'
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol = '0'
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol = "0"' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol = "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol = "0"' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol = "0"' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> '0'
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol <> '0'
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol <> "0"' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol <> "0"' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> "0"' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = '0'
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol = '0'
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol = "0"' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol = "0"' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = "0"' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> '0'
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol <> '0'
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol <> "0"' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol <> "0"' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> "0"' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol <> '0'
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> "0"' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> "0"' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> "0"' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> '0' and
-        # ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> '0' and
+        # ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> "0" and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> "0" and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> "0" and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> "0" and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -370,98 +368,98 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step6
         tdLog.info('=============== step6')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = '1'
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 = '1'
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 = "1"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = "1"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 = "1"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = "1"' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '1'
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> '1'
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> "1"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> "1"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> "1"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> "1"' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = '0'
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 = '0'
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 = "0"' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 = "0"' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = "0"' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> '0'
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 <> '0'
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 <> "0"' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 <> "0"' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> "0"' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = '0'
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 = '0'
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 = "0"' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 = "0"' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = "0"' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 <> '0'
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 <> "0"' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 <> "0"' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> "0"' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol2 <> '0'
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> "0"' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> "0"' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> "0"' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and
-        # ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> '0' and
+        # ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> "0" and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> "0" and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> "0" and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> "0" and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -471,104 +469,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step7
         tdLog.info('=============== step7')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = '1' and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 = '1' and
         # tgcol = '1'
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 = "1" and tgcol = "1"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = "1" and tgcol = "1"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 = "1" and tgcol = "1"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = "1" and tgcol = "1"' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> '1' and
         # tgcol <> '1'
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> "1" and tgcol <> "1"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> "1" and tgcol <> "1"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> "1" and tgcol <> "1"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> "1" and tgcol <> "1"' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = '0' and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 = '0' and
         # tgcol = '0'
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 = "0" and tgcol = "0"' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = "0" and tgcol = "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 = "0" and tgcol = "0"' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = "0" and tgcol = "0"' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 <> '0' and
         # tgcol <> '0'
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 <> "0" and tgcol <> "0"' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> "0" and tgcol <> "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 <> "0" and tgcol <> "0"' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> "0" and tgcol <> "0"' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 = '0' and
         # tgcol = '0'
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 = "0" and tgcol = "0"' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = "0" and tgcol = "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 = "0" and tgcol = "0"' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = "0" and tgcol = "0"' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 <> '0'
         # and tgcol <> '0'
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 <> "0" and tgcol <> "0"' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> "0" and tgcol <> "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 <> "0" and tgcol <> "0"' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> "0" and tgcol <> "0"' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol2 <> '0' and tgcol <> '0'
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> "0" and tgcol <> "0"' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> "0" and tgcol <> "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> "0" and tgcol <> "0"' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> "0" and tgcol <> "0"' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and
-        # ts < now + 5m and ts < now + 5m and tgcol <> '0'
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> '0' and
+        # ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol <> '0'
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> "0" and ts < now + 5m and ts < now + 5m and tgcol <> "0"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> "0" and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol <> "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> "0" and ts < now + 5m and ts < now + 5m and tgcol <> "0"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> "0" and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol <> "0"' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -648,12 +646,12 @@ class TDTestCase:
         # TSIM: print =============== step10
         tdLog.info('=============== step10')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -738,13 +736,13 @@ class TDTestCase:
         # TSIM: print =============== step13
         tdLog.info('=============== step13')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # group by tgcol
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
diff --git a/tests/pytest/tag_lite/bool.py b/tests/pytest/tag_lite/bool.py
index 6f2afd262509571187b83cba26d6773dbfde0464..11ce9eb7f8126e9d0adf4bedeaf055e3f4ab2c1b 100644
--- a/tests/pytest/tag_lite/bool.py
+++ b/tests/pytest/tag_lite/bool.py
@@ -71,14 +71,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -97,14 +96,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -123,81 +121,81 @@ class TDTestCase:
         tdSql.checkRows(rowNum)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (tb))
-        tdSql.query('select * from %s where ts < now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts <= now + 4m
-        tdLog.info('select * from %s where ts <= now + 4m' % (tb))
-        tdSql.query('select * from %s where ts <= now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts <= 1605045600000 + 240001
+        tdLog.info('select * from %s where ts <= 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts <= 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (tb))
-        tdSql.query('select * from %s where ts > now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 15 then
         tdLog.info('tdSql.checkRow(15)')
         tdSql.checkRows(15)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts >= now + 4m
-        tdLog.info('select * from %s where ts >= now + 4m' % (tb))
-        tdSql.query('select * from %s where ts >= now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts >= 1605045600000 + 240001
+        tdLog.info('select * from %s where ts >= 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts >= 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 15 then
         tdLog.info('tdSql.checkRow(15)')
         tdSql.checkRows(15)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (tb))
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
         tdSql.checkRows(1)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m
+        # TSIM: sql select * from $tb where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            'select * from %s where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            'select * from %s where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001' %
             (tb))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001' %
             (tb))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and
-        # ts < now + 6m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and
+        # ts < 1605045600000 + 360001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and ts < 1605045600000 + 360001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and ts < 1605045600000 + 360001' %
             (tb))
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
@@ -216,36 +214,36 @@ class TDTestCase:
         # TSIM: return -1
         # TSIM: endi
         # TSIM:
-        # TSIM: sql select * from $mt where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (mt))
-        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 50 then
         tdLog.info('tdSql.checkRow(50)')
         tdSql.checkRows(50)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (mt))
-        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 150 then
         tdLog.info('tdSql.checkRow(150)')
         tdSql.checkRows(150)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts = now + 4m
-        tdLog.info('select * from %s where ts = now + 4m' % (mt))
-        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts = 1605045600000 + 240001
+        tdLog.info('select * from %s where ts = 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts = 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 10 then
         tdLog.info('tdSql.checkRow(10)')
@@ -324,98 +322,98 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step5
         tdLog.info('=============== step5')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = true
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol = true
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol = true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol = true' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol = true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol = true' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> true
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> true
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> true' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> true' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = false
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol = false
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol = false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol = false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol = false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol = false' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> false
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol <> false
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol <> false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol <> false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> false' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = false
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol = false
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol = false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol = false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = false' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> false
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol <> false
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol <> false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol <> false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> false' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol <> false
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> false' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> false' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> false' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> false
-        # and ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> false
+        # and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> false and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> false and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> false and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> false and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -462,12 +460,12 @@ class TDTestCase:
         # TSIM: print =============== step8
         tdLog.info('=============== step8')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -517,13 +515,13 @@ class TDTestCase:
         # TSIM: print =============== step11
         tdLog.info('=============== step11')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # group by tgcol
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
diff --git a/tests/pytest/tag_lite/bool_binary.py b/tests/pytest/tag_lite/bool_binary.py
index bfc496e8e4013ab5fb1bf929d7aeb3d37238b343..934d91c9084e7631feb6c34c596b23a7e0314cb7 100644
--- a/tests/pytest/tag_lite/bool_binary.py
+++ b/tests/pytest/tag_lite/bool_binary.py
@@ -71,14 +71,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -96,14 +95,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -122,36 +120,36 @@ class TDTestCase:
         # TSIM: return -1
         # TSIM: endi
         # TSIM:
-        # TSIM: sql select * from $mt where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (mt))
-        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 50 then
         tdLog.info('tdSql.checkRow(50)')
         tdSql.checkRows(50)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (mt))
-        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 150 then
         tdLog.info('tdSql.checkRow(150)')
         tdSql.checkRows(150)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts = now + 4m
-        tdLog.info('select * from %s where ts = now + 4m' % (mt))
-        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts = 1605045600000 + 240001
+        tdLog.info('select * from %s where ts = 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts = 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 10 then
         tdLog.info('tdSql.checkRow(10)')
@@ -263,98 +261,98 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step5
         tdLog.info('=============== step5')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = true
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol = true
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol = true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol = true' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol = true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol = true' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> true
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> true
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> true' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> true' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = false
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol = false
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol = false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol = false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol = false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol = false' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> false
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol <> false
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol <> false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol <> false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> false' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = false
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol = false
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol = false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol = false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = false' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> false
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol <> false
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol <> false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol <> false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> false' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol <> false
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> false' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> false' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> false' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> false
-        # and ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> false
+        # and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> false and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> false and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> false and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> false and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -364,98 +362,98 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step6
         tdLog.info('=============== step6')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = '1'
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 = '1'
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 = "1"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = "1"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 = "1"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = "1"' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '1'
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> '1'
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> "1"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> "1"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> "1"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> "1"' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = '0'
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 = '0'
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 = "0"' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 = "0"' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = "0"' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> '0'
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 <> '0'
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 <> "0"' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 <> "0"' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> "0"' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = '0'
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 = '0'
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 = "0"' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 = "0"' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = "0"' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 <> '0'
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 <> "0"' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 <> "0"' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> "0"' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol2 <> '0'
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> "0"' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> "0"' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> "0"' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and
-        # ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> '0' and
+        # ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> "0" and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> "0" and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> "0" and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> "0" and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -465,104 +463,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step7
         tdLog.info('=============== step7')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = '1' and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 = '1' and
         # tgcol = true
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 = "1" and tgcol = true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = "1" and tgcol = true' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 = "1" and tgcol = true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = "1" and tgcol = true' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> '1' and
         # tgcol <> true
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> "1" and tgcol <> true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> "1" and tgcol <> true' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> "1" and tgcol <> true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> "1" and tgcol <> true' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = '0' and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 = '0' and
         # tgcol = false
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 = "0" and tgcol = false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = "0" and tgcol = false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 = "0" and tgcol = false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = "0" and tgcol = false' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 <> '0' and
         # tgcol <> false
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 <> "0" and tgcol <> false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> "0" and tgcol <> false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 <> "0" and tgcol <> false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> "0" and tgcol <> false' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 = '0' and
         # tgcol = false
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 = "0" and tgcol = false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = "0" and tgcol = false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 = "0" and tgcol = false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = "0" and tgcol = false' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 <> '0'
         # and tgcol <> false
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 <> "0" and tgcol <> false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> "0" and tgcol <> false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 <> "0" and tgcol <> false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> "0" and tgcol <> false' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol2 <> '0' and tgcol <> false
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> "0" and tgcol <> false' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> "0" and tgcol <> false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> "0" and tgcol <> false' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> "0" and tgcol <> false' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and
-        # ts < now + 5m and ts < now + 5m and tgcol <> false
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> '0' and
+        # ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol <> false
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> "0" and ts < now + 5m and ts < now + 5m and tgcol <> false' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> "0" and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol <> false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> "0" and ts < now + 5m and ts < now + 5m and tgcol <> false' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> "0" and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol <> false' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -642,12 +640,12 @@ class TDTestCase:
         # TSIM: print =============== step10
         tdLog.info('=============== step10')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -732,13 +730,13 @@ class TDTestCase:
         # TSIM: print =============== step13
         tdLog.info('=============== step13')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # group by tgcol
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
diff --git a/tests/pytest/tag_lite/bool_int.py b/tests/pytest/tag_lite/bool_int.py
index f7bfc7acef276609c8606185102b5463807d577a..1e857192ede0602c8aa5e279da12ea488559ec07 100644
--- a/tests/pytest/tag_lite/bool_int.py
+++ b/tests/pytest/tag_lite/bool_int.py
@@ -71,14 +71,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -96,14 +95,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -122,36 +120,36 @@ class TDTestCase:
         # TSIM: return -1
         # TSIM: endi
         # TSIM:
-        # TSIM: sql select * from $mt where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (mt))
-        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 50 then
         tdLog.info('tdSql.checkRow(50)')
         tdSql.checkRows(50)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (mt))
-        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 150 then
         tdLog.info('tdSql.checkRow(150)')
         tdSql.checkRows(150)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts = now + 4m
-        tdLog.info('select * from %s where ts = now + 4m' % (mt))
-        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts = 1605045600000 + 240001
+        tdLog.info('select * from %s where ts = 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts = 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 10 then
         tdLog.info('tdSql.checkRow(10)')
@@ -295,98 +293,98 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step5
         tdLog.info('=============== step5')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = true
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol = true
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol = true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol = true' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol = true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol = true' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> true
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> true
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> true' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> true' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = false
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol = false
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol = false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol = false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol = false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol = false' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> false
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol <> false
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol <> false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol <> false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> false' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = false
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol = false
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol = false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol = false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = false' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> false
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol <> false
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol <> false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol <> false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> false' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol <> false
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> false' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> false' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> false' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> false
-        # and ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> false
+        # and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> false and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> false and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> false and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> false and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -396,98 +394,98 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step6
         tdLog.info('=============== step6')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and
-        # ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> 0 and
+        # ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -497,104 +495,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step7
         tdLog.info('=============== step7')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 = 1 and
         # tgcol = true
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 = 1 and tgcol = true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1 and tgcol = true' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 = 1 and tgcol = true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1 and tgcol = true' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> 1 and
         # tgcol <> true
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> 1 and tgcol <> true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1 and tgcol <> true' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> 1 and tgcol <> true' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1 and tgcol <> true' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 = 0 and
         # tgcol = false
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 = 0 and tgcol = false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0 and tgcol = false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 = 0 and tgcol = false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0 and tgcol = false' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 <> 0 and
         # tgcol <> false
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 <> 0 and tgcol <> false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0 and tgcol <> false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 <> 0 and tgcol <> false' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0 and tgcol <> false' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 = 0 and
         # tgcol = false
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 = 0 and tgcol = false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0 and tgcol = false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 = 0 and tgcol = false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0 and tgcol = false' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 <> 0 and
         # tgcol <> false
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 <> 0 and tgcol <> false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0 and tgcol <> false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 <> 0 and tgcol <> false' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0 and tgcol <> false' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol2 <> 0 and tgcol <> false
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol <> false' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> 0 and tgcol <> false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol <> false' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> 0 and tgcol <> false' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and
-        # ts < now + 5m and ts < now + 5m and tgcol <> false
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> 0 and
+        # ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol <> false
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol <> false' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol <> false' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol <> false' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol <> false' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -674,12 +672,12 @@ class TDTestCase:
         # TSIM: print =============== step10
         tdLog.info('=============== step10')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -764,13 +762,13 @@ class TDTestCase:
         # TSIM: print =============== step13
         tdLog.info('=============== step13')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # group by tgcol
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
diff --git a/tests/pytest/tag_lite/double.py b/tests/pytest/tag_lite/double.py
index b1f29f592e70c582cde9b9eff114ff78843c6fc3..c9d3a5af9e88a0c1faccfabd17245dcaf54b179f 100644
--- a/tests/pytest/tag_lite/double.py
+++ b/tests/pytest/tag_lite/double.py
@@ -72,14 +72,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -98,14 +97,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -124,56 +122,56 @@ class TDTestCase:
         tdSql.checkRows(rowNum)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (tb))
-        tdSql.query('select * from %s where ts < now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts <= now + 4m
-        tdLog.info('select * from %s where ts <= now + 4m' % (tb))
-        tdSql.query('select * from %s where ts <= now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts <= 1605045600000 + 240001
+        tdLog.info('select * from %s where ts <= 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts <= 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (tb))
-        tdSql.query('select * from %s where ts > now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 15 then
         tdLog.info('tdSql.checkRow(15)')
         tdSql.checkRows(15)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts >= now + 4m
-        tdLog.info('select * from %s where ts >= now + 4m' % (tb))
-        tdSql.query('select * from %s where ts >= now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts >= 1605045600000 + 240001
+        tdLog.info('select * from %s where ts >= 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts >= 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 15 then
         tdLog.info('tdSql.checkRow(15)')
         tdSql.checkRows(15)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (tb))
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
         tdSql.checkRows(1)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m
+        # TSIM: sql select * from $tb where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            'select * from %s where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            'select * from %s where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001' %
             (tb))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
@@ -190,25 +188,25 @@ class TDTestCase:
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001' %
             (tb))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and
-        # ts < now + 6m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and
+        # ts < 1605045600000 + 360001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and ts < 1605045600000 + 360001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and ts < 1605045600000 + 360001' %
             (tb))
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
@@ -227,36 +225,36 @@ class TDTestCase:
         # TSIM: return -1
         # TSIM: endi
         # TSIM:
-        # TSIM: sql select * from $mt where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (mt))
-        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 50 then
         tdLog.info('tdSql.checkRow(50)')
         tdSql.checkRows(50)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (mt))
-        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 150 then
         tdLog.info('tdSql.checkRow(150)')
         tdSql.checkRows(150)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts = now + 4m
-        tdLog.info('select * from %s where ts = now + 4m' % (mt))
-        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts = 1605045600000 + 240001
+        tdLog.info('select * from %s where ts = 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts = 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 10 then
         tdLog.info('tdSql.checkRow(10)')
@@ -333,94 +331,94 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step5
         tdLog.info('=============== step5')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = 1
-        tdLog.info('select * from %s where ts > now + 4m and tgcol = 1' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol = 1
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001 and tgcol = 1' % (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0
-        tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol = 0
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001 and tgcol = 0' % (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts
-        # < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> 0 and ts
+        # < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -467,12 +465,12 @@ class TDTestCase:
         # TSIM: print =============== step8
         tdLog.info('=============== step8')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -522,13 +520,13 @@ class TDTestCase:
         # TSIM: print =============== step11
         tdLog.info('=============== step11')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # group by tgcol
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
diff --git a/tests/pytest/tag_lite/float.py b/tests/pytest/tag_lite/float.py
index 7b93cb0ac91d49299aedfa63e5dcc8571415cdce..589df89ab9e000dae8c953bb64aaeda51ca0c86c 100644
--- a/tests/pytest/tag_lite/float.py
+++ b/tests/pytest/tag_lite/float.py
@@ -72,14 +72,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -98,14 +97,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -124,56 +122,56 @@ class TDTestCase:
         tdSql.checkRows(rowNum)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (tb))
-        tdSql.query('select * from %s where ts < now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts <= now + 4m
-        tdLog.info('select * from %s where ts <= now + 4m' % (tb))
-        tdSql.query('select * from %s where ts <= now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts <= 1605045600000 + 240001
+        tdLog.info('select * from %s where ts <= 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts <= 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (tb))
-        tdSql.query('select * from %s where ts > now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 15 then
         tdLog.info('tdSql.checkRow(15)')
         tdSql.checkRows(15)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts >= now + 4m
-        tdLog.info('select * from %s where ts >= now + 4m' % (tb))
-        tdSql.query('select * from %s where ts >= now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts >= 1605045600000 + 240001
+        tdLog.info('select * from %s where ts >= 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts >= 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 15 then
         tdLog.info('tdSql.checkRow(15)')
         tdSql.checkRows(15)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (tb))
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
         tdSql.checkRows(1)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m
+        # TSIM: sql select * from $tb where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            'select * from %s where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            'select * from %s where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001' %
             (tb))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
@@ -190,25 +188,25 @@ class TDTestCase:
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001' %
             (tb))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and
-        # ts < now + 6m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and
+        # ts < 1605045600000 + 360001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and ts < 1605045600000 + 360001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and ts < 1605045600000 + 360001' %
             (tb))
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
@@ -227,36 +225,36 @@ class TDTestCase:
         # TSIM: return -1
         # TSIM: endi
         # TSIM:
-        # TSIM: sql select * from $mt where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (mt))
-        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 50 then
         tdLog.info('tdSql.checkRow(50)')
         tdSql.checkRows(50)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (mt))
-        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 150 then
         tdLog.info('tdSql.checkRow(150)')
         tdSql.checkRows(150)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts = now + 4m
-        tdLog.info('select * from %s where ts = now + 4m' % (mt))
-        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts = 1605045600000 + 240001
+        tdLog.info('select * from %s where ts = 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts = 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 10 then
         tdLog.info('tdSql.checkRow(10)')
@@ -333,94 +331,94 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step5
         tdLog.info('=============== step5')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = 1
-        tdLog.info('select * from %s where ts > now + 4m and tgcol = 1' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol = 1
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001 and tgcol = 1' % (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0
-        tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol = 0
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001 and tgcol = 0' % (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts
-        # < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> 0 and ts
+        # < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -467,12 +465,12 @@ class TDTestCase:
         # TSIM: print =============== step8
         tdLog.info('=============== step8')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -522,13 +520,13 @@ class TDTestCase:
         # TSIM: print =============== step11
         tdLog.info('=============== step11')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # group by tgcol
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
diff --git a/tests/pytest/tag_lite/int.py b/tests/pytest/tag_lite/int.py
index d5a69173893c4e5c8341b6235c5dd8465f913111..1297d083a0d9aa30a21c3235c89a31236175a119 100644
--- a/tests/pytest/tag_lite/int.py
+++ b/tests/pytest/tag_lite/int.py
@@ -71,14 +71,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -97,14 +96,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -123,56 +121,56 @@ class TDTestCase:
         tdSql.checkRows(rowNum)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (tb))
-        tdSql.query('select * from %s where ts < now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts <= now + 4m
-        tdLog.info('select * from %s where ts <= now + 4m' % (tb))
-        tdSql.query('select * from %s where ts <= now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts <= 1605045600000 + 240001
+        tdLog.info('select * from %s where ts <= 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts <= 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (tb))
-        tdSql.query('select * from %s where ts > now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 15 then
         tdLog.info('tdSql.checkRow(15)')
         tdSql.checkRows(15)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts >= now + 4m
-        tdLog.info('select * from %s where ts >= now + 4m' % (tb))
-        tdSql.query('select * from %s where ts >= now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts >= 1605045600000 + 240001
+        tdLog.info('select * from %s where ts >= 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts >= 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 15 then
         tdLog.info('tdSql.checkRow(15)')
         tdSql.checkRows(15)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (tb))
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
         tdSql.checkRows(1)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m
+        # TSIM: sql select * from $tb where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            'select * from %s where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            'select * from %s where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001' %
             (tb))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
@@ -189,25 +187,25 @@ class TDTestCase:
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001' %
             (tb))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and
-        # ts < now + 6m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and
+        # ts < 1605045600000 + 360001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and ts < 1605045600000 + 360001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and ts < 1605045600000 + 360001' %
             (tb))
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
@@ -226,36 +224,36 @@ class TDTestCase:
         # TSIM: return -1
         # TSIM: endi
         # TSIM:
-        # TSIM: sql select * from $mt where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (mt))
-        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 50 then
         tdLog.info('tdSql.checkRow(50)')
         tdSql.checkRows(50)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (mt))
-        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 150 then
         tdLog.info('tdSql.checkRow(150)')
         tdSql.checkRows(150)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts = now + 4m
-        tdLog.info('select * from %s where ts = now + 4m' % (mt))
-        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts = 1605045600000 + 240001
+        tdLog.info('select * from %s where ts = 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts = 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 10 then
         tdLog.info('tdSql.checkRow(10)')
@@ -332,94 +330,94 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step5
         tdLog.info('=============== step5')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = 1
-        tdLog.info('select * from %s where ts > now + 4m and tgcol = 1' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol = 1
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001 and tgcol = 1' % (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0
-        tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol = 0
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001 and tgcol = 0' % (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts
-        # < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> 0 and ts
+        # < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -466,12 +464,12 @@ class TDTestCase:
         # TSIM: print =============== step8
         tdLog.info('=============== step8')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -521,13 +519,13 @@ class TDTestCase:
         # TSIM: print =============== step11
         tdLog.info('=============== step11')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # group by tgcol
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
diff --git a/tests/pytest/tag_lite/int_binary.py b/tests/pytest/tag_lite/int_binary.py
index 7760814f664b4b04d42b67bba3f86ce069928b70..6ce9a9a431f644e1a6c9e7c9dece955dc9f40bfd 100644
--- a/tests/pytest/tag_lite/int_binary.py
+++ b/tests/pytest/tag_lite/int_binary.py
@@ -72,14 +72,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -98,14 +97,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -124,36 +122,36 @@ class TDTestCase:
         # TSIM: return -1
         # TSIM: endi
         # TSIM:
-        # TSIM: sql select * from $mt where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (mt))
-        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 50 then
         tdLog.info('tdSql.checkRow(50)')
         tdSql.checkRows(50)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (mt))
-        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 150 then
         tdLog.info('tdSql.checkRow(150)')
         tdSql.checkRows(150)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts = now + 4m
-        tdLog.info('select * from %s where ts = now + 4m' % (mt))
-        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts = 1605045600000 + 240001
+        tdLog.info('select * from %s where ts = 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts = 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 10 then
         tdLog.info('tdSql.checkRow(10)')
@@ -265,94 +263,94 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step5
         tdLog.info('=============== step5')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = 1
-        tdLog.info('select * from %s where ts > now + 4m and tgcol = 1' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol = 1
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001 and tgcol = 1' % (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0
-        tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol = 0
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001 and tgcol = 0' % (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts
-        # < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> 0 and ts
+        # < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -362,98 +360,98 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step6
         tdLog.info('=============== step6')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = '1'
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 = '1'
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 = "1"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = "1"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 = "1"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = "1"' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '1'
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> '1'
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> "1"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> "1"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> "1"' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> "1"' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = '0'
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 = '0'
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 = "0"' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 = "0"' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = "0"' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> '0'
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 <> '0'
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 <> "0"' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 <> "0"' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> "0"' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = '0'
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 = '0'
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 = "0"' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 = "0"' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = "0"' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 <> '0'
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 <> "0"' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 <> "0"' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> "0"' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol2 <> '0'
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> "0"' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> "0"' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> "0"' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> "0"' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and
-        # ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> '0' and
+        # ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> "0" and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> "0" and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> "0" and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> "0" and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -463,104 +461,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step7
         tdLog.info('=============== step7')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = '1' and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 = '1' and
         # tgcol = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 = "1" and tgcol = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = "1" and tgcol = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 = "1" and tgcol = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = "1" and tgcol = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> '1' and
         # tgcol <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> "1" and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> "1" and tgcol <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> "1" and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> "1" and tgcol <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = '0' and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 = '0' and
         # tgcol = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 = "0" and tgcol = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = "0" and tgcol = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 = "0" and tgcol = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = "0" and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 <> '0' and
         # tgcol <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 <> "0" and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> "0" and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 <> "0" and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> "0" and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 = '0' and
         # tgcol = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 = "0" and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = "0" and tgcol = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 = "0" and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = "0" and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 <> '0'
         # and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 <> "0" and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> "0" and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 <> "0" and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> "0" and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol2 <> '0' and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> "0" and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> "0" and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> "0" and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> "0" and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and
-        # ts < now + 5m and ts < now + 5m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> '0' and
+        # ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> "0" and ts < now + 5m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> "0" and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> "0" and ts < now + 5m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> "0" and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -640,12 +638,12 @@ class TDTestCase:
         # TSIM: print =============== step10
         tdLog.info('=============== step10')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -730,13 +728,13 @@ class TDTestCase:
         # TSIM: print =============== step13
         tdLog.info('=============== step13')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # group by tgcol
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
diff --git a/tests/pytest/tag_lite/int_float.py b/tests/pytest/tag_lite/int_float.py
index 31c94130ab30e83c68ab017e44cf313202e6b966..341acfd5ae0784c0d0d46a0757490fdfe8bca599 100644
--- a/tests/pytest/tag_lite/int_float.py
+++ b/tests/pytest/tag_lite/int_float.py
@@ -72,14 +72,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -98,14 +97,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -124,36 +122,36 @@ class TDTestCase:
         # TSIM: return -1
         # TSIM: endi
         # TSIM:
-        # TSIM: sql select * from $mt where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (mt))
-        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 50 then
         tdLog.info('tdSql.checkRow(50)')
         tdSql.checkRows(50)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (mt))
-        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 150 then
         tdLog.info('tdSql.checkRow(150)')
         tdSql.checkRows(150)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts = now + 4m
-        tdLog.info('select * from %s where ts = now + 4m' % (mt))
-        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts = 1605045600000 + 240001
+        tdLog.info('select * from %s where ts = 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts = 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 10 then
         tdLog.info('tdSql.checkRow(10)')
@@ -301,94 +299,94 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step5
         tdLog.info('=============== step5')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = 1
-        tdLog.info('select * from %s where ts > now + 4m and tgcol = 1' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol = 1
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001 and tgcol = 1' % (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0
-        tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol = 0
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001 and tgcol = 0' % (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts
-        # < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> 0 and ts
+        # < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -398,98 +396,98 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step6
         tdLog.info('=============== step6')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol2 <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and
-        # ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> 0 and
+        # ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -499,104 +497,104 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step7
         tdLog.info('=============== step7')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 = 1 and
         # tgcol = 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 = 1 and tgcol = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1 and tgcol = 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 = 1 and tgcol = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 = 1 and tgcol = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> 1 and
         # tgcol <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> 1 and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1 and tgcol <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> 1 and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 1 and tgcol <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 = 0 and
         # tgcol = 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 = 0 and tgcol = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0 and tgcol = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 = 0 and tgcol = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 = 0 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol2 <> 0 and
         # tgcol <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol2 <> 0 and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol2 <> 0 and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol2 <> 0 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 = 0 and
         # tgcol = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 = 0 and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0 and tgcol = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 = 0 and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 = 0 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol2 <> 0 and
         # tgcol <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol2 <> 0 and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol2 <> 0 and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol2 <> 0 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol2 <> 0 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> 0 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol2 <> 0 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and
-        # ts < now + 5m and ts < now + 5m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol2 <> 0 and
+        # ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol2 <> 0 and ts < 1605045600000 + 300001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -676,12 +674,12 @@ class TDTestCase:
         # TSIM: print =============== step10
         tdLog.info('=============== step10')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -766,13 +764,13 @@ class TDTestCase:
         # TSIM: print =============== step13
         tdLog.info('=============== step13')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # group by tgcol
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
diff --git a/tests/pytest/tag_lite/smallint.py b/tests/pytest/tag_lite/smallint.py
index c060e3f82b6b5f2b6d32fd50e5ea8181f655ad9b..93fde22ca92219852426ac18c550231130d23384 100644
--- a/tests/pytest/tag_lite/smallint.py
+++ b/tests/pytest/tag_lite/smallint.py
@@ -72,14 +72,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -98,14 +97,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -124,56 +122,56 @@ class TDTestCase:
         tdSql.checkRows(rowNum)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (tb))
-        tdSql.query('select * from %s where ts < now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts <= now + 4m
-        tdLog.info('select * from %s where ts <= now + 4m' % (tb))
-        tdSql.query('select * from %s where ts <= now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts <= 1605045600000 + 240001
+        tdLog.info('select * from %s where ts <= 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts <= 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (tb))
-        tdSql.query('select * from %s where ts > now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 15 then
         tdLog.info('tdSql.checkRow(15)')
         tdSql.checkRows(15)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts >= now + 4m
-        tdLog.info('select * from %s where ts >= now + 4m' % (tb))
-        tdSql.query('select * from %s where ts >= now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts >= 1605045600000 + 240001
+        tdLog.info('select * from %s where ts >= 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts >= 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 15 then
         tdLog.info('tdSql.checkRow(15)')
         tdSql.checkRows(15)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (tb))
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
         tdSql.checkRows(1)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m
+        # TSIM: sql select * from $tb where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            'select * from %s where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            'select * from %s where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001' %
             (tb))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
@@ -190,25 +188,25 @@ class TDTestCase:
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001' %
             (tb))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and
-        # ts < now + 6m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and
+        # ts < 1605045600000 + 360001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and ts < 1605045600000 + 360001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and ts < 1605045600000 + 360001' %
             (tb))
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
@@ -227,36 +225,36 @@ class TDTestCase:
         # TSIM: return -1
         # TSIM: endi
         # TSIM:
-        # TSIM: sql select * from $mt where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (mt))
-        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 50 then
         tdLog.info('tdSql.checkRow(50)')
         tdSql.checkRows(50)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (mt))
-        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 150 then
         tdLog.info('tdSql.checkRow(150)')
         tdSql.checkRows(150)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts = now + 4m
-        tdLog.info('select * from %s where ts = now + 4m' % (mt))
-        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts = 1605045600000 + 240001
+        tdLog.info('select * from %s where ts = 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts = 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 10 then
         tdLog.info('tdSql.checkRow(10)')
@@ -333,94 +331,94 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step5
         tdLog.info('=============== step5')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = 1
-        tdLog.info('select * from %s where ts > now + 4m and tgcol = 1' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol = 1
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001 and tgcol = 1' % (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0
-        tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol = 0
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001 and tgcol = 0' % (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts
-        # < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> 0 and ts
+        # < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -467,12 +465,12 @@ class TDTestCase:
         # TSIM: print =============== step8
         tdLog.info('=============== step8')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -522,13 +520,13 @@ class TDTestCase:
         # TSIM: print =============== step11
         tdLog.info('=============== step11')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # group by tgcol
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
diff --git a/tests/pytest/tag_lite/tinyint.py b/tests/pytest/tag_lite/tinyint.py
index 089dd46569578c1ca33d73639cb36a0bba03e0f0..fc4af4ee9648ef6aca5badeada5420063f76050b 100644
--- a/tests/pytest/tag_lite/tinyint.py
+++ b/tests/pytest/tag_lite/tinyint.py
@@ -72,14 +72,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -98,14 +97,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -124,56 +122,56 @@ class TDTestCase:
         tdSql.checkRows(rowNum)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (tb))
-        tdSql.query('select * from %s where ts < now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts <= now + 4m
-        tdLog.info('select * from %s where ts <= now + 4m' % (tb))
-        tdSql.query('select * from %s where ts <= now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts <= 1605045600000 + 240001
+        tdLog.info('select * from %s where ts <= 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts <= 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (tb))
-        tdSql.query('select * from %s where ts > now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 15 then
         tdLog.info('tdSql.checkRow(15)')
         tdSql.checkRows(15)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts >= now + 4m
-        tdLog.info('select * from %s where ts >= now + 4m' % (tb))
-        tdSql.query('select * from %s where ts >= now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts >= 1605045600000 + 240001
+        tdLog.info('select * from %s where ts >= 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts >= 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 15 then
         tdLog.info('tdSql.checkRow(15)')
         tdSql.checkRows(15)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (tb))
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
         tdSql.checkRows(1)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m
+        # TSIM: sql select * from $tb where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            'select * from %s where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            'select * from %s where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001' %
             (tb))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
@@ -190,25 +188,25 @@ class TDTestCase:
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001' %
             (tb))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and
-        # ts < now + 6m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and
+        # ts < 1605045600000 + 360001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and ts < 1605045600000 + 360001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and ts < 1605045600000 + 360001' %
             (tb))
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
@@ -227,36 +225,36 @@ class TDTestCase:
         # TSIM: return -1
         # TSIM: endi
         # TSIM:
-        # TSIM: sql select * from $mt where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (mt))
-        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 50 then
         tdLog.info('tdSql.checkRow(50)')
         tdSql.checkRows(50)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (mt))
-        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 150 then
         tdLog.info('tdSql.checkRow(150)')
         tdSql.checkRows(150)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts = now + 4m
-        tdLog.info('select * from %s where ts = now + 4m' % (mt))
-        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts = 1605045600000 + 240001
+        tdLog.info('select * from %s where ts = 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts = 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 10 then
         tdLog.info('tdSql.checkRow(10)')
@@ -333,94 +331,94 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step5
         tdLog.info('=============== step5')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = 1
-        tdLog.info('select * from %s where ts > now + 4m and tgcol = 1' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol = 1
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001 and tgcol = 1' % (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0
-        tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol = 0
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001 and tgcol = 0' % (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts
-        # < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> 0 and ts
+        # < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -467,12 +465,12 @@ class TDTestCase:
         # TSIM: print =============== step8
         tdLog.info('=============== step8')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -522,13 +520,13 @@ class TDTestCase:
         # TSIM: print =============== step11
         tdLog.info('=============== step11')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # group by tgcol
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
diff --git a/tests/pytest/tag_lite/unsignedBigint.py b/tests/pytest/tag_lite/unsignedBigint.py
index 032dacd366437c378b0b8c9b553d6495966cd563..6a33812f8839bf8c329c35b9c700bf5479d14a64 100644
--- a/tests/pytest/tag_lite/unsignedBigint.py
+++ b/tests/pytest/tag_lite/unsignedBigint.py
@@ -72,14 +72,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -98,14 +97,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -124,56 +122,56 @@ class TDTestCase:
         tdSql.checkRows(rowNum)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (tb))
-        tdSql.query('select * from %s where ts < now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts <= now + 4m
-        tdLog.info('select * from %s where ts <= now + 4m' % (tb))
-        tdSql.query('select * from %s where ts <= now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts <= 1605045600000 + 240001
+        tdLog.info('select * from %s where ts <= 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts <= 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (tb))
-        tdSql.query('select * from %s where ts > now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 15 then
         tdLog.info('tdSql.checkRow(15)')
         tdSql.checkRows(15)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts >= now + 4m
-        tdLog.info('select * from %s where ts >= now + 4m' % (tb))
-        tdSql.query('select * from %s where ts >= now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts >= 1605045600000 + 240001
+        tdLog.info('select * from %s where ts >= 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts >= 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 15 then
         tdLog.info('tdSql.checkRow(15)')
         tdSql.checkRows(15)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (tb))
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
         tdSql.checkRows(1)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m
+        # TSIM: sql select * from $tb where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            'select * from %s where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            'select * from %s where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001' %
             (tb))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
@@ -190,25 +188,25 @@ class TDTestCase:
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001' %
             (tb))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and
-        # ts < now + 6m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and
+        # ts < 1605045600000 + 360001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and ts < 1605045600000 + 360001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and ts < 1605045600000 + 360001' %
             (tb))
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
@@ -227,36 +225,36 @@ class TDTestCase:
         # TSIM: return -1
         # TSIM: endi
         # TSIM:
-        # TSIM: sql select * from $mt where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (mt))
-        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 50 then
         tdLog.info('tdSql.checkRow(50)')
         tdSql.checkRows(50)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (mt))
-        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 150 then
         tdLog.info('tdSql.checkRow(150)')
         tdSql.checkRows(150)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts = now + 4m
-        tdLog.info('select * from %s where ts = now + 4m' % (mt))
-        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts = 1605045600000 + 240001
+        tdLog.info('select * from %s where ts = 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts = 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 10 then
         tdLog.info('tdSql.checkRow(10)')
@@ -333,94 +331,94 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step5
         tdLog.info('=============== step5')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = 1
-        tdLog.info('select * from %s where ts > now + 4m and tgcol = 1' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol = 1
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001 and tgcol = 1' % (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0
-        tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol = 0
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001 and tgcol = 0' % (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts
-        # < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> 0 and ts
+        # < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -467,12 +465,12 @@ class TDTestCase:
         # TSIM: print =============== step8
         tdLog.info('=============== step8')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -522,13 +520,13 @@ class TDTestCase:
         # TSIM: print =============== step11
         tdLog.info('=============== step11')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # group by tgcol
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
diff --git a/tests/pytest/tag_lite/unsignedInt.py b/tests/pytest/tag_lite/unsignedInt.py
index 6efe12edf110f70d9c2c0187429a0696372bae49..6e741d351abe5c5608f45e414bcabc6d40dd0980 100644
--- a/tests/pytest/tag_lite/unsignedInt.py
+++ b/tests/pytest/tag_lite/unsignedInt.py
@@ -4,7 +4,7 @@ import sys
 from util.log import *
 from util.cases import *
 from util.sql import *
-
+import time
 
 class TDTestCase:
     def init(self, conn, logSql):
@@ -72,14 +72,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -98,14 +97,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -114,6 +112,7 @@ class TDTestCase:
             # TSIM: endw
         # TSIM:
         # TSIM: print =============== step2
+        time.sleep(1)
         tdLog.info('=============== step2')
         # TSIM: sleep 100
         # TSIM: sql select * from $tb
@@ -124,56 +123,56 @@ class TDTestCase:
         tdSql.checkRows(rowNum)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (tb))
-        tdSql.query('select * from %s where ts < now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts <= now + 4m
-        tdLog.info('select * from %s where ts <= now + 4m' % (tb))
-        tdSql.query('select * from %s where ts <= now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts <= 1605045600000 + 240001
+        tdLog.info('select * from %s where ts <= 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts <= 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (tb))
-        tdSql.query('select * from %s where ts > now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 15 then
         tdLog.info('tdSql.checkRow(15)')
         tdSql.checkRows(15)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts >= now + 4m
-        tdLog.info('select * from %s where ts >= now + 4m' % (tb))
-        tdSql.query('select * from %s where ts >= now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts >= 1605045600000 + 240001
+        tdLog.info('select * from %s where ts >= 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts >= 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 15 then
         tdLog.info('tdSql.checkRow(15)')
         tdSql.checkRows(15)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (tb))
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
         tdSql.checkRows(1)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m
+        # TSIM: sql select * from $tb where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            'select * from %s where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            'select * from %s where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001' %
             (tb))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
@@ -190,25 +189,25 @@ class TDTestCase:
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001' %
             (tb))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and
-        # ts < now + 6m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and
+        # ts < 1605045600000 + 360001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and ts < 1605045600000 + 360001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and ts < 1605045600000 + 360001' %
             (tb))
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
@@ -227,36 +226,36 @@ class TDTestCase:
         # TSIM: return -1
         # TSIM: endi
         # TSIM:
-        # TSIM: sql select * from $mt where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (mt))
-        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 50 then
         tdLog.info('tdSql.checkRow(50)')
         tdSql.checkRows(50)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (mt))
-        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 150 then
         tdLog.info('tdSql.checkRow(150)')
         tdSql.checkRows(150)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts = now + 4m
-        tdLog.info('select * from %s where ts = now + 4m' % (mt))
-        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts = 1605045600000 + 240001
+        tdLog.info('select * from %s where ts = 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts = 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 10 then
         tdLog.info('tdSql.checkRow(10)')
@@ -333,94 +332,94 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step5
         tdLog.info('=============== step5')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = 1
-        tdLog.info('select * from %s where ts > now + 4m and tgcol = 1' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol = 1
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001 and tgcol = 1' % (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0
-        tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol = 0
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001 and tgcol = 0' % (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts
-        # < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> 0 and ts
+        # < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -467,12 +466,12 @@ class TDTestCase:
         # TSIM: print =============== step8
         tdLog.info('=============== step8')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -522,13 +521,13 @@ class TDTestCase:
         # TSIM: print =============== step11
         tdLog.info('=============== step11')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # group by tgcol
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
diff --git a/tests/pytest/tag_lite/unsignedSmallint.py b/tests/pytest/tag_lite/unsignedSmallint.py
index 59cb33dc18eb74b27e9a916e921e10cbabf1b4eb..21c390d9dca81fc6eb6ef87435acb1bf6d12c406 100644
--- a/tests/pytest/tag_lite/unsignedSmallint.py
+++ b/tests/pytest/tag_lite/unsignedSmallint.py
@@ -72,14 +72,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -98,14 +97,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -124,56 +122,56 @@ class TDTestCase:
         tdSql.checkRows(rowNum)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (tb))
-        tdSql.query('select * from %s where ts < now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts <= now + 4m
-        tdLog.info('select * from %s where ts <= now + 4m' % (tb))
-        tdSql.query('select * from %s where ts <= now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts <= 1605045600000 + 240001
+        tdLog.info('select * from %s where ts <= 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts <= 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (tb))
-        tdSql.query('select * from %s where ts > now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 15 then
         tdLog.info('tdSql.checkRow(15)')
         tdSql.checkRows(15)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts >= now + 4m
-        tdLog.info('select * from %s where ts >= now + 4m' % (tb))
-        tdSql.query('select * from %s where ts >= now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts >= 1605045600000 + 240001
+        tdLog.info('select * from %s where ts >= 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts >= 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 15 then
         tdLog.info('tdSql.checkRow(15)')
         tdSql.checkRows(15)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (tb))
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
         tdSql.checkRows(1)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m
+        # TSIM: sql select * from $tb where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            'select * from %s where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            'select * from %s where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001' %
             (tb))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
@@ -190,25 +188,25 @@ class TDTestCase:
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001' %
             (tb))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and
-        # ts < now + 6m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and
+        # ts < 1605045600000 + 360001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and ts < 1605045600000 + 360001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and ts < 1605045600000 + 360001' %
             (tb))
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
@@ -227,36 +225,36 @@ class TDTestCase:
         # TSIM: return -1
         # TSIM: endi
         # TSIM:
-        # TSIM: sql select * from $mt where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (mt))
-        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 50 then
         tdLog.info('tdSql.checkRow(50)')
         tdSql.checkRows(50)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (mt))
-        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 150 then
         tdLog.info('tdSql.checkRow(150)')
         tdSql.checkRows(150)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts = now + 4m
-        tdLog.info('select * from %s where ts = now + 4m' % (mt))
-        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts = 1605045600000 + 240001
+        tdLog.info('select * from %s where ts = 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts = 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 10 then
         tdLog.info('tdSql.checkRow(10)')
@@ -333,94 +331,94 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step5
         tdLog.info('=============== step5')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = 1
-        tdLog.info('select * from %s where ts > now + 4m and tgcol = 1' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol = 1
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001 and tgcol = 1' % (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0
-        tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol = 0
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001 and tgcol = 0' % (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts
-        # < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> 0 and ts
+        # < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -467,12 +465,12 @@ class TDTestCase:
         # TSIM: print =============== step8
         tdLog.info('=============== step8')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -522,13 +520,13 @@ class TDTestCase:
         # TSIM: print =============== step11
         tdLog.info('=============== step11')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # group by tgcol
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
diff --git a/tests/pytest/tag_lite/unsignedTinyint.py b/tests/pytest/tag_lite/unsignedTinyint.py
index 1250b08d1b8dd4d3cb5f61af424576146ab70967..7ce3a8398444efae63ccdc93062c00c81c644da0 100644
--- a/tests/pytest/tag_lite/unsignedTinyint.py
+++ b/tests/pytest/tag_lite/unsignedTinyint.py
@@ -72,14 +72,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -98,14 +97,13 @@ class TDTestCase:
             # TSIM: while $x < $rowNum
             while (x < rowNum):
                 # TSIM: $ms = $x . m
-                ms = "%dm" % x
-                # TSIM: sql insert into $tb values (now + $ms , $x )
+                ms = x * 60000
                 tdLog.info(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 tdSql.execute(
-                    'insert into %s values (now + %s , %d )' %
-                    (tb, ms, x))
+                    "insert into %s values (%d, %d)" %
+                    (tb, 1605045600000 + ms, x))
                 # TSIM: $x = $x + 1
                 x = x + 1
                 # TSIM: endw
@@ -124,56 +122,56 @@ class TDTestCase:
         tdSql.checkRows(rowNum)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (tb))
-        tdSql.query('select * from %s where ts < now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts <= now + 4m
-        tdLog.info('select * from %s where ts <= now + 4m' % (tb))
-        tdSql.query('select * from %s where ts <= now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts <= 1605045600000 + 240001
+        tdLog.info('select * from %s where ts <= 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts <= 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (tb))
-        tdSql.query('select * from %s where ts > now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 15 then
         tdLog.info('tdSql.checkRow(15)')
         tdSql.checkRows(15)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts >= now + 4m
-        tdLog.info('select * from %s where ts >= now + 4m' % (tb))
-        tdSql.query('select * from %s where ts >= now + 4m' % (tb))
+        # TSIM: sql select * from $tb where ts >= 1605045600000 + 240001
+        tdLog.info('select * from %s where ts >= 1605045600000 + 240001' % (tb))
+        tdSql.query('select * from %s where ts >= 1605045600000 + 240001' % (tb))
         # TSIM: if $rows != 15 then
         tdLog.info('tdSql.checkRow(15)')
         tdSql.checkRows(15)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (tb))
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
         tdSql.checkRows(1)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m
+        # TSIM: sql select * from $tb where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            'select * from %s where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            'select * from %s where ts < 1605045600000 + 240001 and ts > 1605045600000 + 300001' %
             (tb))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
@@ -190,25 +188,25 @@ class TDTestCase:
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 180001' %
             (tb))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and
-        # ts < now + 6m
+        # TSIM: sql select * from $tb where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and
+        # ts < 1605045600000 + 360001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and ts < 1605045600000 + 360001' %
             (tb))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts > 1605045600000 + 300001 and ts < 1605045600000 + 360001' %
             (tb))
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
@@ -227,36 +225,36 @@ class TDTestCase:
         # TSIM: return -1
         # TSIM: endi
         # TSIM:
-        # TSIM: sql select * from $mt where ts < now + 4m
-        tdLog.info('select * from %s where ts < now + 4m' % (mt))
-        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts < 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 50 then
         tdLog.info('tdSql.checkRow(50)')
         tdSql.checkRows(50)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m
-        tdLog.info('select * from %s where ts > now + 4m' % (mt))
-        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts > 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 150 then
         tdLog.info('tdSql.checkRow(150)')
         tdSql.checkRows(150)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts = now + 4m
-        tdLog.info('select * from %s where ts = now + 4m' % (mt))
-        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: sql select * from $mt where ts = 1605045600000 + 240001
+        tdLog.info('select * from %s where ts = 1605045600000 + 240001' % (mt))
+        tdSql.query('select * from %s where ts = 1605045600000 + 240001' % (mt))
         # TSIM: if $rows != 0 then
         tdLog.info('tdSql.checkRow(0)')
         tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 10 then
         tdLog.info('tdSql.checkRow(10)')
@@ -333,94 +331,94 @@ class TDTestCase:
         # TSIM:
         # TSIM: print =============== step5
         tdLog.info('=============== step5')
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = 1
-        tdLog.info('select * from %s where ts > now + 4m and tgcol = 1' % (mt))
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol = 1
+        tdLog.info('select * from %s where ts > 1605045600000 + 240001 and tgcol = 1' % (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol = 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol = 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> 1
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 1' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 1' %
             (mt))
         # TSIM: if $rows != 75 then
         tdLog.info('tdSql.checkRow(75)')
         tdSql.checkRows(75)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0
-        tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt))
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol = 0
+        tdLog.info('select * from %s where ts < 1605045600000 + 240001 and tgcol = 0' % (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol = 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts < 1605045600000 + 240001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            'select * from %s where ts < 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol = 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol = 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0
+        # TSIM: sql select * from $mt where ts <= 1605045600000 + 240001 and tgcol <> 0
         tdLog.info(
-            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            'select * from %s where ts <= 1605045600000 + 240001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 25 then
         tdLog.info('tdSql.checkRow(25)')
         tdSql.checkRows(25)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and
         # tgcol <> 0
         tdLog.info(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            'select * from %s where ts > 1605045600000 + 240001 and ts < 1605045600000 + 300001 and tgcol <> 0' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
         tdSql.checkRows(5)
         # TSIM: return -1
         # TSIM: endi
-        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts
-        # < now + 5m
+        # TSIM: sql select * from $mt where ts > 1605045600000 + 240001 and tgcol <> 0 and ts
+        # < 1605045600000 + 300001
         tdLog.info(
-            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         tdSql.query(
-            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            'select * from %s where ts > 1605045600000 + 240001 and tgcol <> 0 and ts < 1605045600000 + 300001' %
             (mt))
         # TSIM: if $rows != 5 then
         tdLog.info('tdSql.checkRow(5)')
@@ -467,12 +465,12 @@ class TDTestCase:
         # TSIM: print =============== step8
         tdLog.info('=============== step8')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
@@ -522,13 +520,13 @@ class TDTestCase:
         # TSIM: print =============== step11
         tdLog.info('=============== step11')
         # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
-        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < 1605045600000 + 240001
         # group by tgcol
         tdLog.info(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         tdSql.query(
-            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < 1605045600000 + 240001 group by tgcol' %
             (mt))
         # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
         tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
diff --git a/tests/pytest/tools/taosdemoAllTest/manual_change_time_1_1_A.json b/tests/pytest/tools/taosdemoAllTest/manual_change_time_1_1_A.json
new file mode 100644
index 0000000000000000000000000000000000000000..7b8abd6d4e25991d38ff16c737bf8169c7311318
--- /dev/null
+++ b/tests/pytest/tools/taosdemoAllTest/manual_change_time_1_1_A.json
@@ -0,0 +1,60 @@
+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "thread_count": 4,                   
+    "thread_count_create_tbl": 4,        
+    "result_file": "./insert_res.txt",   
+    "confirm_parameter_prompt": "no",    
+    "insert_interval": 0,         
+    "interlace_rows": 100,        
+    "num_of_records_per_req": 32766,
+    "databases": [{
+        "dbinfo": {
+            "name": "db",
+            "drop": "yes",                
+            "replica": 1,
+            "days": 1,
+            "cache": 4,
+            "blocks": 3,
+            "precision": "ms",
+            "keep": 10,
+            "minRows": 1000,
+            "maxRows": 4096,
+            "comp":2,
+            "walLevel":1,
+            "cachelast":0,
+            "quorum":1,
+            "fsync":3000,
+            "update": 0
+        },
+        "super_tables": [{
+            "name": "stb",
+            "child_table_exists":"no",   
+            "childtable_count": 1,   
+            "childtable_prefix": "stb_", 
+            "auto_create_table": "no",   
+            "batch_create_tbl_num": 20,   
+            "data_source": "rand",       
+            "insert_mode": "taosc",      
+            "insert_rows": 864000,       
+            "childtable_limit": 1,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 1000,         
+            "start_timestamp": "2020-10-11 00:00:00.000",  
+            "sample_format": "csv",       
+            "sample_file": "./tools/taosdemoAllTest/sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "BINARY", "len": 5120, "count":1}],
+            "tags": [{"type": "TINYINT", "count":2}]
+        }]
+    }]
+}
\ No newline at end of file
diff --git a/tests/pytest/tools/taosdemoAllTest/manual_change_time_1_1_B.json b/tests/pytest/tools/taosdemoAllTest/manual_change_time_1_1_B.json
new file mode 100644
index 0000000000000000000000000000000000000000..aeee6322e5c0e6b58c0433be5f345e7c4f84f339
--- /dev/null
+++ b/tests/pytest/tools/taosdemoAllTest/manual_change_time_1_1_B.json
@@ -0,0 +1,60 @@
+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "thread_count": 4,                   
+    "thread_count_create_tbl": 4,        
+    "result_file": "./insert_res.txt",   
+    "confirm_parameter_prompt": "no",    
+    "insert_interval": 0,         
+    "interlace_rows": 100,        
+    "num_of_records_per_req": 32766,
+    "databases": [{
+        "dbinfo": {
+            "name": "db",
+            "drop": "no",                
+            "replica": 1,
+            "days": 1,
+            "cache": 4,
+            "blocks": 3,
+            "precision": "ms",
+            "keep": 10,
+            "minRows": 1000,
+            "maxRows": 4096,
+            "comp":2,
+            "walLevel":1,
+            "cachelast":0,
+            "quorum":1,
+            "fsync":3000,
+            "update": 0
+        },
+        "super_tables": [{
+            "name": "stb",
+            "child_table_exists":"yes",   
+            "childtable_count": 1,   
+            "childtable_prefix": "stb_", 
+            "auto_create_table": "yes",   
+            "batch_create_tbl_num": 20,   
+            "data_source": "rand",       
+            "insert_mode": "taosc",      
+            "insert_rows": 432000,       
+            "childtable_limit": 1,      
+            "childtable_offset":0,     
+            "interlace_rows": 0,         
+            "insert_interval":0,         
+            "max_sql_len": 1024000,      
+            "disorder_ratio": 0,         
+            "disorder_range": 1000,      
+            "timestamp_step": 1000,         
+            "start_timestamp": "2020-10-16 00:00:00.500",  
+            "sample_format": "csv",       
+            "sample_file": "./tools/taosdemoAllTest/sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "BINARY", "len": 5120, "count":1}],
+            "tags": [{"type": "TINYINT", "count":1}]
+        }]
+    }]
+}
\ No newline at end of file
diff --git a/tests/pytest/util/pathFinding.py b/tests/pytest/util/pathFinding.py
new file mode 100644
index 0000000000000000000000000000000000000000..9dee5142ce3539c7cd145c3d8364e01c4af25164
--- /dev/null
+++ b/tests/pytest/util/pathFinding.py
@@ -0,0 +1,83 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+
+import os
+from util.log import *
+
+
+
+class TDFindPath:
+    """This class is for finding path within TDengine
+    """
+    def __init__(self):
+        self.file = ""
+
+
+    def init(self, file):
+        """[summary]
+
+        Args:
+            file (str): the file location you want to start the query. Generally using __file__
+        """
+        self.file = file
+
+    def getTaosdemoPath(self):
+        """for finding the path of directory containing taosdemo
+
+        Returns:
+            str: the path to directory containing taosdemo
+        """
+        selfPath = os.path.dirname(os.path.realpath(self.file))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        for root, dirs, files in os.walk(projPath):
+            if ("taosd" in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    buildPath = root[:len(root)-len("/build/bin")]
+                    break
+        if (buildPath == ""):
+            tdLog.exit("taosd not found!")
+        else:
+            tdLog.info(f"taosd found in {buildPath}")
+        return buildPath + "/build/bin/"  
+
+    def getTDenginePath(self):
+        """for finding the root path of TDengine
+
+        Returns:
+            str: the root path of TDengine
+        """
+        selfPath = os.path.dirname(os.path.realpath(self.file))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+        print(projPath)
+        for root, dirs, files in os.walk(projPath):
+            if ("sim" in dirs):
+                print(root)
+                rootRealPath = os.path.realpath(root)
+        if (rootRealPath == ""):
+            tdLog.exit("TDengine not found!")
+        else:
+            tdLog.info(f"TDengine found in {rootRealPath}")  
+        return rootRealPath
+
+tdFindPath = TDFindPath()
\ No newline at end of file
diff --git a/tests/script/fullGeneralSuite.sim b/tests/script/fullGeneralSuite.sim
index 2cd22362005de07eb2a02b1d0fadec9fc8bdca08..937265753323a41e51ddf9a3be0061c66b6c586a 100644
--- a/tests/script/fullGeneralSuite.sim
+++ b/tests/script/fullGeneralSuite.sim
@@ -135,6 +135,7 @@ run general/parser/tags_dynamically_specifiy.sim
 run general/parser/set_tag_vals.sim
 #unsupport run general/parser/repeatAlter.sim
 #unsupport run general/parser/slimit_alter_tags.sim
+run general/parser/precision_ns.sim
 run general/stable/disk.sim
 run general/stable/dnode3.sim
 run general/stable/metrics.sim
diff --git a/tests/script/general/db/alter_option.sim b/tests/script/general/db/alter_option.sim
index c3bb23855fceb877c1ed39c01524231d27edb4f4..c20a96fd1bd18ba911cce02859d7265d0294b76b 100644
--- a/tests/script/general/db/alter_option.sim
+++ b/tests/script/general/db/alter_option.sim
@@ -112,21 +112,21 @@ endi
 sql alter database db keep 30
 sql show databases
 print keep $data7_db
-if $data7_db != 20,20,30 then
+if $data7_db != 30,30,30 then
   return -1
 endi
 
 sql alter database db keep 40
 sql show databases
 print keep $data7_db
-if $data7_db != 20,20,40 then
+if $data7_db != 40,40,40 then
   return -1
 endi
 
-sql alter database db keep 40
-sql alter database db keep 30
+sql alter database db keep 40,50
+sql alter database db keep 30,31
 sql alter database db keep 20
-sql_error alter database db keep 10
+sql_error alter database db keep 10.0
 sql_error alter database db keep 9
 sql_error alter database db keep 1
 sql_error alter database db keep 0
@@ -177,7 +177,7 @@ sql alter database db blocks 20
 sql alter database db blocks 10
 sql_error alter database db blocks 2
 sql_error alter database db blocks 1
-sql alter database db blocks 0
+sql_error alter database db blocks 0
 sql_error alter database db blocks -1
 sql_error alter database db blocks 10001
 
diff --git a/tests/script/general/db/topic1.sim b/tests/script/general/db/topic1.sim
index 2b4cce5e64bf7076eeb2f0f0e3c1dfbaa224b116..4939e5a0e2274e8ab26465fe04ca99a79f9f9ce0 100644
--- a/tests/script/general/db/topic1.sim
+++ b/tests/script/general/db/topic1.sim
@@ -367,7 +367,7 @@ sql_error topic db keep 30
 sql alter database db keep 30
 sql show databases
 print keep $data7_db
-if $data7_db != 20,20,30 then
+if $data7_db != 30,30,30 then
   return -1
 endi
 
@@ -375,14 +375,14 @@ sql_error alter topic db keep 40
 sql alter database db keep 40
 sql show databases
 print keep $data7_db
-if $data7_db != 20,20,40 then
+if $data7_db != 40,40,40 then
   return -1
 endi
 
 sql alter database db keep 40
 sql alter database db keep 30
 sql alter database db keep 20
-sql_error alter database db keep 10
+sql_error alter database db keep 10.0
 sql_error alter database db keep 9
 sql_error alter database db keep 1
 sql_error alter database db keep 0
@@ -455,7 +455,7 @@ sql alter database db blocks 20
 sql alter database db blocks 10
 sql_error alter database db blocks 2
 sql_error alter database db blocks 1
-sql alter database db blocks 0
+sql_error alter database db blocks 0
 sql_error alter database db blocks -1
 sql_error alter database db blocks 10001
 
diff --git a/tests/script/general/http/restful_full.sim b/tests/script/general/http/restful_full.sim
index 8094a943f507a702bb56a7d026da672134188b83..a5d3ac2b862f3b2b72b0453a2c1bb2b578672246 100644
--- a/tests/script/general/http/restful_full.sim
+++ b/tests/script/general/http/restful_full.sim
@@ -88,7 +88,7 @@ print ===============  step2 - no db
 #11
 system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'show databases' 127.0.0.1:7111/rest/sql
 print 11-> $system_content
-if $system_content != @{"status":"succ","head":["name","created_time","ntables","vgroups","replica","quorum","days","keep0,keep1,keep(D)","cache(MB)","blocks","minrows","maxrows","wallevel","fsync","comp","cachelast","precision","update","status"],"column_meta":[["name",8,32],["created_time",9,8],["ntables",4,4],["vgroups",4,4],["replica",3,2],["quorum",3,2],["days",3,2],["keep0,keep1,keep(D)",8,24],["cache(MB)",4,4],["blocks",4,4],["minrows",4,4],["maxrows",4,4],["wallevel",2,1],["fsync",4,4],["comp",2,1],["cachelast",2,1],["precision",8,3],["update",2,1],["status",8,10]],"data":[],"rows":0}@ then
+if $system_content != @{"status":"succ","head":["name","created_time","ntables","vgroups","replica","quorum","days","keep0,keep1,keep2","cache(MB)","blocks","minrows","maxrows","wallevel","fsync","comp","cachelast","precision","update","status"],"column_meta":[["name",8,32],["created_time",9,8],["ntables",4,4],["vgroups",4,4],["replica",3,2],["quorum",3,2],["days",3,2],["keep0,keep1,keep2",8,24],["cache(MB)",4,4],["blocks",4,4],["minrows",4,4],["maxrows",4,4],["wallevel",2,1],["fsync",4,4],["comp",2,1],["cachelast",2,1],["precision",8,3],["update",2,1],["status",8,10]],"data":[],"rows":0}@ then
   return -1
 endi
 
diff --git a/tests/script/general/parser/alter.sim b/tests/script/general/parser/alter.sim
index 6c884973963200fe416fba5a428b7050aa2329c2..d1a4702a69dce22e7de0de005d912e7813648e01 100644
--- a/tests/script/general/parser/alter.sim
+++ b/tests/script/general/parser/alter.sim
@@ -20,8 +20,82 @@ $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
 sql drop database if exists $db
-sql create database $db
+sql create database $db days 10 keep 20,20,20
 sql use $db
+
+sql_error alter database $db keep "20"
+sql_error alter database $db keep "20","20","20"
+sql_error alter database $db keep 20,19
+sql_error alter database $db keep 20.0
+sql_error alter database $db keep 20.0,20.0,20.0
+sql_error alter database $db keep 0,0,0
+sql_error alter database $db keep -1,-1,-1
+sql_error alter database $db keep 9,20
+sql_error alter database $db keep 9,9,9
+sql_error alter database $db keep 20,20,19
+sql_error alter database $db keep 20,19,20
+sql_error alter database $db keep 20,19,19
+sql_error alter database $db keep 20,19,18
+sql_error alter database $db keep 20,20,20,20
+sql_error alter database $db keep 365001,365001,365001
+sql alter database $db keep 21
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data07 != 21,21,21 then 
+ return -1
+endi
+sql alter database $db keep 11,12
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data07 != 11,12,12 then 
+ return -1
+endi
+sql alter database $db keep 20,20,20
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data07 != 20,20,20 then 
+ return -1
+endi
+sql alter database $db keep 10,10,10
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data07 != 10,10,10 then 
+ return -1
+endi
+sql alter database $db keep 10,10,11
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data07 != 10,10,11 then 
+ return -1
+endi
+sql alter database $db keep 11,12,13
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data07 != 11,12,13 then 
+ return -1
+endi
+sql alter database $db keep 365000,365000,365000
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data07 != 365000,365000,365000 then 
+ return -1
+endi
+
+
 ##### alter table test, simeplest case
 sql create table tb (ts timestamp, c1 int, c2 int, c3 int)
 sql insert into tb values (now, 1, 1, 1)
diff --git a/tests/script/general/parser/alter__for_community_version.sim b/tests/script/general/parser/alter__for_community_version.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f55fb812a74eead44e54808b000a48c3db92b66d
--- /dev/null
+++ b/tests/script/general/parser/alter__for_community_version.sim
@@ -0,0 +1,316 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/exec.sh -n dnode1 -s start
+sleep 100
+sql connect
+
+$dbPrefix = m_alt_db
+$tbPrefix = m_alt_tb
+$mtPrefix = m_alt_mt
+$tbNum = 10
+$rowNum = 5
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== alter.sim
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database if exists $db
+sql create database $db days 10 keep 20
+sql use $db
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data07 != 20 then 
+ return -1
+endi
+
+sql_error alter database $db keep "20"
+sql_error alter database $db keep "20","20","20"
+sql_error alter database $db keep 0
+sql_error alter database $db keep 20.0
+sql_error alter database $db keep 20.0,20.0,20.0
+sql_error alter database $db keep 0,0,0
+sql_error alter database $db keep 3
+sql_error alter database $db keep -1,-1,-1
+sql_error alter database $db keep 20,20
+sql_error alter database $db keep 9,9,9
+sql_error alter database $db keep 20,20,19
+sql_error alter database $db keep 20,19,20
+sql_error alter database $db keep 20,19,19
+sql_error alter database $db keep 20,19,18
+sql_error alter database $db keep 20,20,20,20
+sql_error alter database $db keep 365001,365001,365001
+sql_error alter database $db keep 365001
+sql alter database $db keep 20
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data07 != 20 then 
+ return -1
+endi
+sql alter database $db keep 10
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data07 != 10 then 
+ return -1
+endi
+sql alter database $db keep 11
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data07 != 11 then 
+ return -1
+endi
+sql alter database $db keep 13
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data07 != 13 then 
+ return -1
+endi
+sql alter database $db keep 365000
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data07 != 365000 then 
+ return -1
+endi
+
+
+##### alter table test, simeplest case
+sql create table tb (ts timestamp, c1 int, c2 int, c3 int)
+sql insert into tb values (now, 1, 1, 1)
+sql select * from tb order by ts desc
+if $rows != 1 then
+  return -1
+endi
+sql alter table tb drop column c3
+sql select * from tb order by ts desc 
+if $data01 != 1 then
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != null then
+  return -1
+endi
+sql alter table tb add column c3 nchar(4)
+sql select * from tb order by ts desc
+if $rows != 1 then
+  return -1
+endi
+if $data03 != NULL then
+  return -1
+endi
+sql insert into tb values (now, 2, 2, 'taos')
+sql select * from tb order by ts desc
+if $rows != 2 then
+  return -1
+endi
+print data03 = $data03
+if $data03 != taos then
+  print expect taos, actual: $data03
+  return -1
+endi
+sql drop table tb
+
+##### alter metric test, simplest case
+sql create table mt (ts timestamp, c1 int, c2 int, c3 int) tags (t1 int)
+sql create table tb using mt tags(1)
+sql insert into tb values (now, 1, 1, 1)
+sql alter table mt drop column c3
+sql select * from tb order by ts desc
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != null then
+  return -1
+endi
+
+sql alter table mt add column c3 nchar(4)
+sql select * from tb order by ts desc
+if $data03 != NULL then
+  return -1
+endi
+sql insert into tb values (now, 2, 2, 'taos')
+sql select * from tb order by ts desc
+if $rows != 2 then
+  return -1
+endi
+if $data03 != taos then
+  return -1
+endi
+if $data13 != NULL then
+  return -1
+endi
+sql drop table tb
+sql drop table mt
+
+## [TBASE272]
+sql create table tb (ts timestamp, c1 int, c2 int, c3 int)
+sql insert into tb values (now, 1, 1, 1)
+sql alter table tb drop column c3
+sql alter table tb add column c3 nchar(5)
+sql insert into tb values(now, 2, 2, 'taos')
+sql drop table tb
+sql create table mt (ts timestamp, c1 int, c2 int, c3 int) tags (t1 int)
+sql create table tb using mt tags(1)
+sql insert into tb values (now, 1, 1, 1)
+sql alter table mt drop column c3
+sql select * from tb order by ts desc
+if $rows != 1 then
+  return -1
+endi
+sql drop table tb
+sql drop table mt
+
+sleep 100
+### ALTER TABLE WHILE STREAMING [TBASE271]
+#sql create table tb1 (ts timestamp, c1 int, c2 nchar(5), c3 int)
+#sql create table strm as select count(*), avg(c1), first(c2), sum(c3) from tb1 interval(2s)
+#sql select * from strm
+#if $rows != 0 then
+#  return -1
+#endi
+##sleep 12000
+#sql insert into tb1 values (now, 1, 'taos', 1)
+#sleep 20000
+#sql select * from strm
+#print rows = $rows
+#if $rows != 1 then
+#  return -1
+#endi
+#if $data04 != 1 then
+#  return -1
+#endi
+#sql alter table tb1 drop column c3
+#sleep 500
+#sql insert into tb1 values (now, 2, 'taos')
+#sleep 30000
+#sql select * from strm
+#if $rows != 2 then
+#   return -1
+#endi
+#if $data04 != 1 then
+#  return -1
+#endi
+#sql alter table tb1 add column c3 int
+#sleep 500
+#sql insert into tb1 values (now, 3, 'taos', 3);
+#sleep 100
+#sql select * from strm
+#if $rows != 3 then
+#   return -1
+#endi
+#if $data04 != 1 then
+#  return -1
+#endi
+
+## ALTER TABLE AND INSERT BY COLUMNS
+sql create table mt (ts timestamp, c1 int, c2 int) tags(t1 int)
+sql create table tb using mt tags(0)
+sql insert into tb values (now-1m, 1, 1)
+sql alter table mt drop column c2
+sql_error insert into tb (ts, c1, c2) values (now, 2, 2)
+sql insert into tb (ts, c1) values (now, 2)
+sql select * from tb order by ts desc
+if $rows != 2 then
+  return -1
+endi
+if $data01 != 2 then
+  return -1
+endi
+if $data02 != null then
+  return -1
+endi
+sql alter table mt add column c2 int
+sql insert into tb (ts, c2) values (now, 3)
+sql select * from tb order by ts desc 
+if $data02 != 3 then
+  return -1
+endi
+
+## ALTER TABLE AND IMPORT
+sql drop database $db
+sql create database $db
+sql use $db
+sql create table mt (ts timestamp, c1 int, c2 nchar(7), c3 int) tags (t1 int)
+sql create table tb using mt tags(1)
+sleep 100
+sql insert into tb values ('2018-11-01 16:30:00.000', 1, 'insert', 1)
+sql alter table mt drop column c3
+
+sql insert into tb values ('2018-11-01 16:29:59.000', 1, 'insert')
+sql import into tb values ('2018-11-01 16:29:59.000', 1, 'import')
+sql select * from tb order by ts desc
+if $data01 != 1 then
+  return -1
+endi
+if $data02 != insert then
+  return -1
+endi
+sql alter table mt add column c3 nchar(4)
+sql select * from tb order by ts desc 
+if $data03 != NULL then
+  return -1
+endi
+
+print ============================>TD-3366 TD-3486
+sql insert into td_3366(ts, c3, c1) using mt(t1) tags(911) values('2018-1-1 11:11:11', 'new1', 12);
+sql insert into td_3486(ts, c3, c1) using mt(t1) tags(-12) values('2018-1-1 11:11:11', 'new1', 12);
+sql insert into ttxu(ts, c3, c1) using mt(t1) tags('-121') values('2018-1-1 11:11:11', 'new1', 12);
+
+sql insert into tb(ts, c1, c3) using mt(t1) tags(123) values('2018-11-01 16:29:58.000', 2, 'port')
+
+sql insert into tb values ('2018-11-01 16:29:58.000', 2, 'import', 3)
+sql import into tb values ('2018-11-01 16:29:58.000', 2, 'import', 3)
+sql import into tb values ('2018-11-01 16:39:58.000', 2, 'import', 3)
+sql select * from tb order by ts desc 
+if $rows != 4 then
+  return -1
+endi
+
+if $data03 != 3 then
+  return -1
+endi
+
+##### ILLEGAL OPERATIONS
+
+# try dropping columns that are defined in metric
+sql_error alter table tb drop column c1;
+
+# try dropping primary key
+sql_error alter table mt drop column ts;
+
+# try modifying two columns in a single statement
+sql_error alter table mt add column c5 nchar(3) c6 nchar(4)
+
+# duplicate columns
+sql_error alter table mt add column c1 int
+
+# drop non-existing columns
+sql_error alter table mt drop column c9
+
+#sql drop database $db
+#sql show databases
+#if $rows != 0 then
+#  return -1
+#endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/parser/create_db.sim b/tests/script/general/parser/create_db.sim
index 9ca84af136ad16735c9faf4f10ba913775f53103..7881060ad178fe3b3f7a9ea0530a1ac517264a3e 100644
--- a/tests/script/general/parser/create_db.sim
+++ b/tests/script/general/parser/create_db.sim
@@ -102,7 +102,7 @@ print create_db.sim case5: db_meta_data test
 # cfg params
 $replica = 1 # max=3
 $days = 10
-$keep = 365
+$keep = 365,365,365
 $rows_db = 1000
 $cache = 16 # 16MB
 $ablocks = 100 
@@ -150,6 +150,73 @@ sql_error create database $db day 3651
 
 # keep [1, infinity]
 sql_error create database $db keep 0
+sql_error create database $db keep 0,0,0
+sql_error create database $db keep 3,3,3
+sql_error create database $db keep 11.0
+sql_error create database $db keep 11.0,11.0,11.0
+sql_error create database $db keep "11","11","11"
+sql_error create database $db keep "11"
+sql_error create database $db keep 13,12,11
+sql_error create database $db keep 11,12,11
+sql_error create database $db keep 12,11,12
+sql_error create database $db keep 8
+sql_error create database $db keep 12,11
+sql_error create database $db keep 365001,365001,365001
+sql create database dbk0 keep 19
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data07 != 19,19,19 then 
+ return -1
+endi
+sql drop database dbk0
+sql create database dbka keep 19,20
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data07 != 19,20,20 then 
+ return -1
+endi
+sql drop database dbka
+
+sql create database dbk1 keep 11,11,11
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data07 != 11,11,11 then 
+ return -1
+endi
+sql drop database dbk1
+sql create database dbk2 keep 11,12,13
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data07 != 11,12,13 then 
+ return -1
+endi
+sql drop database dbk2
+sql create database dbk3 keep 11,11,13
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data07 != 11,11,13 then 
+ return -1
+endi
+sql drop database dbk3
+sql create database dbk4 keep 11,13,13
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data07 != 11,13,13 then 
+ return -1
+endi
+sql drop database dbk4
 #sql_error create database $db keep 3651
 
 # rows [200, 10000]
diff --git a/tests/script/general/parser/create_db__for_community_version.sim b/tests/script/general/parser/create_db__for_community_version.sim
new file mode 100644
index 0000000000000000000000000000000000000000..406e69b0e6a025c5e733ab753510f65677e4b550
--- /dev/null
+++ b/tests/script/general/parser/create_db__for_community_version.sim
@@ -0,0 +1,238 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/exec.sh -n dnode1 -s start
+
+sleep 100
+sql connect
+print ======================== dnode1 start
+
+$dbPrefix = fi_in_db
+$tbPrefix = fi_in_tb
+$mtPrefix = fi_in_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print excuting test script create_db.sim
+print =============== set up
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql_error createdatabase $db
+sql create database $db
+sql use $db
+sql show databases
+
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != $db then 
+  return -1
+endi
+sql drop database $db
+
+# case1: case_insensitivity test
+print =========== create_db.sim case1: case insensitivity test
+sql_error CREATEDATABASE $db
+sql CREATE DATABASE $db
+sql use $db
+sql show databases
+
+if $rows != 1 then
+  return -1
+endi
+if $data00 != $db then 
+  return -1
+endi
+sql drop database $db
+print case_insensitivity test passed
+
+# case2: illegal_db_name test
+print =========== create_db.sim case2: illegal_db_name test
+$illegal_db1 = 1db
+$illegal_db2 = d@b
+
+sql_error create database $illegal_db1
+sql_error create database $illegal_db2
+print illegal_db_name test passed
+
+# case3: chinese_char_in_db_name test
+print ========== create_db.sim case3: chinese_char_in_db_name test
+$CN_db1 = 数据库
+$CN_db2 = 数据库1
+$CN_db3 = db数据库1
+sql_error create database $CN_db1
+sql_error create database $CN_db2
+sql_error create database $CN_db3
+#sql show databases
+#if $rows != 3 then
+#  return -1
+#endi
+#if $data00 != $CN_db1 then
+#  return -1
+#endi
+#if $data10 != $CN_db2 then
+#  return -1
+#endi
+#if $data20 != $CN_db3 then
+#  return -1
+#endi
+#sql drop database $CN_db1
+#sql drop database $CN_db2
+#sql drop database $CN_db3
+print case_chinese_char_in_db_name test passed
+
+# case4: db_already_exists
+print create_db.sim case4: db_already_exists
+sql create database db0
+sql create database db0
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+sql drop database db0
+print db_already_exists test passed
+
+# case5: db_meta_data
+print create_db.sim case5: db_meta_data test
+# cfg params
+$replica = 1 # max=3
+$days = 10
+$keep = 365
+$rows_db = 1000
+$cache = 16 # 16MB
+$ablocks = 100 
+$tblocks = 32 # max=512, automatically trimmed when exceeding
+$ctime = 36000 # 10 hours
+$wal = 1 # valid value is 1, 2
+$comp = 1 # max=32, automatically trimmed when exceeding
+
+sql create database $db replica $replica days $days keep $keep maxrows $rows_db cache $cache blocks 4 ctime $ctime wal $wal comp $comp
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data00 != $db then 
+ return -1
+endi
+if $data04 != $replica then 
+ return -1
+endi
+if $data06 != $days then 
+ return -1
+endi
+if $data07 != 365 then 
+ return -1
+endi
+print data08 = $data07
+if $data08 != $cache then
+ print expect $cache, actual:$data08
+ return -1
+endi
+if $data09 != 4 then
+ return -1
+endi
+
+sql drop database $db
+
+## param range tests
+# replica [1,3]
+#sql_error create database $db replica 0
+sql_error create database $db replica 4
+
+# day [1, 3650]
+sql_error create database $db day 0
+sql_error create database $db day 3651 
+
+# keep [1, infinity]
+sql_error create database $db keep 0
+sql_error create database $db keep 0,0,0
+sql_error create database $db keep 3,3,3
+sql_error create database $db keep 3
+sql_error create database $db keep 11.0
+sql_error create database $db keep 11.0,11.0,11.0
+sql_error create database $db keep "11","11","11"
+sql_error create database $db keep "11"
+sql_error create database $db keep 13,12,11
+sql_error create database $db keep 11,12,11
+sql_error create database $db keep 12,11,12
+sql_error create database $db keep 11,12,13
+sql_error create database $db keep 11,12,13,14
+sql_error create database $db keep 11,11
+sql_error create database $db keep 365001,365001,365001
+sql_error create database $db keep 365001
+sql create database dbk1 keep 11
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data07 != 11 then 
+ return -1
+endi
+sql drop database dbk1
+sql create database dbk2 keep 12
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data07 != 12 then 
+ return -1
+endi
+sql drop database dbk2
+sql create database dbk3 keep 11
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data07 != 11 then 
+ return -1
+endi
+sql drop database dbk3
+sql create database dbk4 keep 13
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data07 != 13 then 
+ return -1
+endi
+sql drop database dbk4
+#sql_error create database $db keep 3651
+
+# rows [200, 10000]
+sql_error create database $db maxrows 199
+#sql_error create database $db maxrows 10001
+
+# cache [100, 10485760]
+sql_error create database $db cache 0
+#sql_error create database $db cache 10485761
+
+
+# blocks [32, 4096 overwriten by 4096 if exceeds, Note added:2018-10-24]
+#sql_error create database $db tblocks 31
+#sql_error create database $db tblocks 4097
+
+# ctime [30, 40960]
+sql_error create database $db ctime 29
+sql_error create database $db ctime 40961
+
+# wal {0, 2}
+#sql_error create database $db wal 0
+sql_error create database $db wal -1
+sql_error create database $db wal 3
+
+# comp {0, 1, 2}
+sql_error create database $db comp -1
+sql_error create database $db comp 3
+
+sql_error drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/parser/first_last.sim b/tests/script/general/parser/first_last.sim
index f47f67ddc668c94f423cb3a42d97be3d52c8dcda..09047b4528a68219f27fc3b2e913a62fd567cd42 100644
--- a/tests/script/general/parser/first_last.sim
+++ b/tests/script/general/parser/first_last.sim
@@ -124,4 +124,4 @@ if $rows != 10000 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/parser/join_multivnode.sim b/tests/script/general/parser/join_multivnode.sim
index c72b2c5b3e4018c892f1194671b0d577c053c7f5..61438241b0cb943cf9d1df09799076cf7dbadeab 100644
--- a/tests/script/general/parser/join_multivnode.sim
+++ b/tests/script/general/parser/join_multivnode.sim
@@ -367,4 +367,4 @@ if $data35 != 5 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/parser/precision_ns.sim b/tests/script/general/parser/precision_ns.sim
new file mode 100644
index 0000000000000000000000000000000000000000..3e9a2dd3ffdcd1f15e05c28273af9484e33840d4
--- /dev/null
+++ b/tests/script/general/parser/precision_ns.sim
@@ -0,0 +1,113 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/exec.sh -n dnode1 -s start
+sleep 1000
+sql connect
+
+$dbPrefix = m_di_db_ns
+$tbPrefix = m_di_tb
+$mtPrefix = m_di_mt
+$ntPrefix = m_di_nt
+$tbNum = 2
+$rowNum = 200
+$futureTs = 300000000000 
+
+print =============== step1: create database and tables and insert data
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$nt = $ntPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db precision 'ns'
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+
+  $x = 0
+  while $x < $rowNum
+    $cc = $futureTs + $x * 100 + 43
+    $ns = $cc . b
+    sql insert into $tb values (now + $ns , $x ) 
+    $x = $x + 1
+  endw 
+
+  $i = $i + 1
+endw 
+
+sql create table $nt (ts timestamp, tbcol int)
+$x = 0
+while $x < $rowNum
+    $cc = $futureTs + $x * 100 + 43
+    $ns = $cc . b
+    sql insert into $nt values (now + $ns , $x ) 
+    $x = $x + 1  
+endw
+
+sleep 100
+
+print =============== step2: select count(*) from tables
+$i = 0
+$tb = $tbPrefix . $i
+
+sql select count(*) from $tb
+
+if $data00 != $rowNum then
+  print expect $rowNum, actual:$data00
+  return -1
+endi
+
+$i = 0
+$mt = $mtPrefix . $i
+sql select count(*) from $mt
+
+$mtRowNum = $tbNum * $rowNum
+if $data00 != $mtRowNum then
+  print expect $mtRowNum, actual:$data00
+  return -1
+endi
+
+$i = 0
+$nt = $ntPrefix . $i
+
+sql select count(*) from $nt
+
+if $data00 != $rowNum then
+  print expect $rowNum, actual:$data00
+  return -1
+endi
+
+print =============== step3: check nano second timestamp
+$i = 0
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql insert into $tb values (now-43b , $x ) 
+sql select count(*) from $tb where ts<now
+if $data00 != 1 then
+  print expected 1, actual: $data00
+endi
+
+
+print =============== step4: check interval/sliding nano second
+$i = 0
+$mt = $mtPrefix . $i
+sql_error select count(*) from $mt interval(1000b) sliding(100b)
+sql_error select count(*) from $mt interval(10000000b) sliding(99999b)
+
+sql select count(*) from $mt interval(100000000b) sliding(100000000b)
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/parser/select_with_tags.sim b/tests/script/general/parser/select_with_tags.sim
index 9d5214bfaaa6fdca44def066a85f49b87731c836..45f6f5c49fbe48f6b881e4f03c3ed1af18a4b1a9 100644
--- a/tests/script/general/parser/select_with_tags.sim
+++ b/tests/script/general/parser/select_with_tags.sim
@@ -902,4 +902,4 @@ sql_error select first(c1), count(*), t2, t1, tbname from select_tags_mt0 group
 #sql select count(c1) from select_tags_mt0 where c1=99 group by tbname;
 #sql select count(*),tbname from select_tags_mt0 group by tbname
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/parser/testSuite.sim b/tests/script/general/parser/testSuite.sim
index bb220049af0e219c18d0fc3fd6e8ad69f5cd1612..545e19edecba723685d1d5a0e2b4b1506c298b4b 100644
--- a/tests/script/general/parser/testSuite.sim
+++ b/tests/script/general/parser/testSuite.sim
@@ -62,4 +62,5 @@ run general/parser/binary_escapeCharacter.sim
 run general/parser/between_and.sim
 run general/parser/last_cache.sim
 run general/parser/nestquery.sim
+run general/parser/precision_ns.sim
 
diff --git a/tests/script/general/parser/timestamp_query.sim b/tests/script/general/parser/timestamp_query.sim
index 4e553c73f41cc9d28025c5de08935af02ee10335..3f6a1af4bc552d0bb54aedcb086e035c3b73bfd2 100644
--- a/tests/script/general/parser/timestamp_query.sim
+++ b/tests/script/general/parser/timestamp_query.sim
@@ -24,6 +24,8 @@ $tsu = $tsu + $ts0
 print ==================>issue #3481, normal column not allowed,
 sql_error select ts,c1,min(c2) from ts_stb0
 
+print ==================>issue #4681, not equal operator on primary timestamp not allowed 
+sql_error select * from ts_stb0 where ts <> $ts0
 
 ##### select from supertable
 $tb = $tbPrefix . 0
@@ -51,4 +53,4 @@ sql select first(c1), last(c1), (1537325400 - 1537146000)/(5*60) v from $tb wher
 if $data13 != 598.000000000 then
   print expect 598.000000000, actual $data03
   return -1
-endi
\ No newline at end of file
+endi
diff --git a/tests/script/general/parser/topbot.sim b/tests/script/general/parser/topbot.sim
index 5c61acb2ba246f1f0102ed01b90e0b164ebfa8dc..ddab1b3f83acfc4fc454740093c3e4e003bab3d4 100644
--- a/tests/script/general/parser/topbot.sim
+++ b/tests/script/general/parser/topbot.sim
@@ -175,7 +175,7 @@ if $data21 != 2.10000 then
 endi
 
 print =====================td-1302 case
-sql create database t1 keep 36500;
+sql create database t1 keep 36500
 sql use t1;
 sql create table test(ts timestamp, k int);
 sql insert into test values(29999, 1)(70000, 2)(80000, 3)
@@ -194,7 +194,7 @@ if $rows != 3 then
 endi
 
 print ==============>td-1308
-sql create database db keep 36500;
+sql create database db keep 36500
 sql use db;
 
 sql create table stb (ts timestamp, c1 int, c2 binary(10)) tags(t1 binary(10));
@@ -377,4 +377,4 @@ sql_error select * from ttm2 where k<>null
 sql_error select * from ttm2 where k like null
 sql_error select * from ttm2 where k<null
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index ce770aee56c9ddb7b3a6b866e4317d09c463c8d6..daac2caf5da086d538d0ec4845737a819f6fa1cd 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -424,6 +424,10 @@ cd ../../../debug; make
 ./test.sh -f general/parser/stableOp.sim
 ./test.sh -f general/parser/timestamp.sim
 ./test.sh -f general/parser/sliding.sim
+./test.sh -f general/parser/having.sim
+./test.sh -f general/parser/having_child.sim
+./test.sh -f general/parser/between_and.sim
+./test.sh -f general/parser/last_cache.sim
 ./test.sh -f unique/big/balance.sim
 
 #======================b7-end===============
diff --git a/tests/script/regressionSuite.sim b/tests/script/regressionSuite.sim
index d5742cd98ff4184d50c256309c807e0b19bbe1c2..bada2f655202ddc34ce6e67e718336a2afc41d50 100644
--- a/tests/script/regressionSuite.sim
+++ b/tests/script/regressionSuite.sim
@@ -134,6 +134,7 @@ run general/parser/bug.sim
 run general/parser/tags_dynamically_specifiy.sim
 run general/parser/set_tag_vals.sim
 run general/parser/repeatAlter.sim
+run general/parser/precision_ns.sim
 ##unsupport run general/parser/slimit_alter_tags.sim
 run general/stable/disk.sim
 run general/stable/dnode3.sim
diff --git a/tests/tsim/src/simExe.c b/tests/tsim/src/simExe.c
index c5b8d5c5ebf1da4dd5072282cef336c0648f1354..7d74946e939bb5f34f81ef6a6aee56a31c4a6cfe 100644
--- a/tests/tsim/src/simExe.c
+++ b/tests/tsim/src/simExe.c
@@ -813,8 +813,15 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) {
               value[length[i]] = 0;
               // snprintf(value, fields[i].bytes, "%s", (char *)row[i]);
               break;
-            case TSDB_DATA_TYPE_TIMESTAMP:
-              tt = *(int64_t *)row[i] / 1000;
+            case TSDB_DATA_TYPE_TIMESTAMP: {
+              int32_t precision = taos_result_precision(pSql);
+              if (precision == TSDB_TIME_PRECISION_MILLI) {
+                tt = (*(int64_t *)row[i]) / 1000;
+              } else if (precision == TSDB_TIME_PRECISION_MICRO) {
+                tt = (*(int64_t *)row[i]) / 1000000;
+              } else {
+                tt = (*(int64_t *)row[i]) / 1000000000;
+              }
               /* comment out as it make testcases like select_with_tags.sim fail.
                 but in windows, this may cause the call to localtime crash if tt < 0,
                 need to find a better solution.
@@ -829,9 +836,16 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) {
 
               tp = localtime(&tt);
               strftime(timeStr, 64, "%y-%m-%d %H:%M:%S", tp);
-              sprintf(value, "%s.%03d", timeStr, (int32_t)(*((int64_t *)row[i]) % 1000));
+              if (precision == TSDB_TIME_PRECISION_MILLI) {
+                sprintf(value, "%s.%03d", timeStr, (int32_t)(*((int64_t *)row[i]) % 1000));
+              } else if (precision == TSDB_TIME_PRECISION_MICRO) {
+                sprintf(value, "%s.%06d", timeStr, (int32_t)(*((int64_t *)row[i]) % 1000000));
+              } else {
+                sprintf(value, "%s.%09d", timeStr, (int32_t)(*((int64_t *)row[i]) % 1000000000));                
+              }
 
               break;
+            }
             default:
               break;
           }  // end of switch