Merge branch 'develop' into feature/TD-4034

3ed41dec · lichuang · d66b6e2d · 6b3e339c · 3ed41dec · 3ed41dec
42 changed file
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
+# Use the latest 2.1 version of CircleCI pipeline process engine. See: https://circleci.com/docs/2.0/configuration-reference
+version: 2.1
+# Use a package of configuration called an orb.
+orbs:
+  # Declare a dependency on the welcome-orb
+  welcome: circleci/welcome-orb@0.4.1
+# Orchestrate or schedule a set of jobs
+workflows:
+  # Name the workflow "welcome"
+  welcome:
+    # Run the welcome/run job in its own container
+    jobs:
+      - welcome/run
--- a/.gitmodules
+++ b/.gitmodules
 [submodule "src/connector/go"]
 	path = src/connector/go
-	url = https://github.com/taosdata/driver-go
+	url = git@github.com:taosdata/driver-go.git
 [submodule "src/connector/grafanaplugin"]
 	path = src/connector/grafanaplugin
-	url = https://github.com/taosdata/grafanaplugin
+	url = git@github.com:taosdata/grafanaplugin.git
 [submodule "src/connector/hivemq-tdengine-extension"]
 	path = src/connector/hivemq-tdengine-extension
-	url = https://github.com/huskar-t/hivemq-tdengine-extension.git
+	url = git@github.com:taosdata/hivemq-tdengine-extension.git
 [submodule "tests/examples/rust"]
 	path = tests/examples/rust
 	url = https://github.com/songtianyi/tdengine-rust-bindings.git
--- a/README-CN.md
+++ b/README-CN.md
@@ -116,7 +116,7 @@ mkdir debug && cd debug
 cmake .. && cmake --build .
 ```
-在X86-64、X86、arm64 和 arm32 平台上，TDengine 生成脚本可以自动检测机器架构。也可以手动配置 CPUTYPE 参数来指定 CPU 类型，如 aarch64 或 aarch32 等。
+在X86-64、X86、arm64、arm32 和 mips64 平台上，TDengine 生成脚本可以自动检测机器架构。也可以手动配置 CPUTYPE 参数来指定 CPU 类型，如 aarch64 或 aarch32 等。
 aarch64：
@@ -130,6 +130,12 @@ aarch32：
 cmake .. -DCPUTYPE=aarch32 && cmake --build .
 ```
+mips64：
+```bash
+cmake .. -DCPUTYPE=mips64 && cmake --build .
+```
 ### Windows 系统
 如果你使用的是 Visual Studio 2013 版本：

--- a/README.md
+++ b/README.md
@@ -110,7 +110,7 @@ mkdir debug && cd debug
 cmake .. && cmake --build .
 ```
-TDengine build script can detect the host machine's architecture on X86-64, X86, arm64 and arm32 platform.
+TDengine build script can detect the host machine's architecture on X86-64, X86, arm64, arm32 and mips64 platform.
 You can also specify CPUTYPE option like aarch64 or aarch32 too if the detection result is not correct:
 aarch64:
@@ -123,6 +123,11 @@ aarch32:
 cmake .. -DCPUTYPE=aarch32 && cmake --build .
 ```
+mips64:
+```bash
+cmake .. -DCPUTYPE=mips64 && cmake --build .
+```
 ### On Windows platform
 If you use the Visual Studio 2013, please open a command window by executing "cmd.exe".

--- a/cmake/version.inc
+++ b/cmake/version.inc
@@ -4,7 +4,7 @@ PROJECT(TDengine)
 IF (DEFINED VERNUMBER)
  SET(TD_VER_NUMBER ${VERNUMBER})
 ELSE ()
-  SET(TD_VER_NUMBER "2.1.0.0")
+  SET(TD_VER_NUMBER "2.1.1.0")
 ENDIF ()
 IF (DEFINED VERCOMPATIBLE)

--- a/documentation20/cn/12.taos-sql/01.error-code/docs.md
+++ b/documentation20/cn/12.taos-sql/01.error-code/docs.md
 # TDengine 2.0 错误码以及对应的十进制码
-| 状态码                 |  模  |   错误码（十六进制） |  错误描述                  | 错误码（十进制）   |
+| 状态码                                  |  模  | 错误码（十六进制） | 错误描述                                     | 错误码（十进制） |
-|-----------------------| :---: | :---------:  | :------------------------ | ---------------- |
+| :-------------------------------------- | :--: | :----------------: | :------------------------------------------- | :--------------- |
-|TSDB_CODE_RPC_ACTION_IN_PROGRESS|	0	| 0x0001|	 "Action in progress"|	-2147483647|
+| TSDB_CODE_RPC_ACTION_IN_PROGRESS        |  0   |       0x0001       | "Action in progress"                         | -2147483647      |
-|TSDB_CODE_RPC_AUTH_REQUIRED|	0	| 0x0002	| "Authentication required"|	-2147483646|
+| TSDB_CODE_RPC_AUTH_REQUIRED             |  0   |       0x0002       | "Authentication required"                    | -2147483646      |
-|TSDB_CODE_RPC_AUTH_FAILURE|	0|	 0x0003	| "Authentication failure"|	-2147483645|
+| TSDB_CODE_RPC_AUTH_FAILURE              |  0   |       0x0003       | "Authentication failure"                     | -2147483645      |
-|TSDB_CODE_RPC_REDIRECT	|0	| 0x0004|	 "Redirect"|	-2147483644|
+| TSDB_CODE_RPC_REDIRECT                  |  0   |       0x0004       | "Redirect"                                   | -2147483644      |
-|TSDB_CODE_RPC_NOT_READY|	0	| 0x0005	| "System not ready"|	-2147483643|
+| TSDB_CODE_RPC_NOT_READY                 |  0   |       0x0005       | "System not ready"                           | -2147483643      |
-|TSDB_CODE_RPC_ALREADY_PROCESSED|	0	| 0x0006	 |"Message already processed"|	-2147483642|
+| TSDB_CODE_RPC_ALREADY_PROCESSED         |  0   |       0x0006       | "Message already processed"                  | -2147483642      |
-|TSDB_CODE_RPC_LAST_SESSION_NOT_FINISHED|	0	 |0x0007|	 "Last session not finished"|	-2147483641|
+| TSDB_CODE_RPC_LAST_SESSION_NOT_FINISHED |  0   |       0x0007       | "Last session not finished"                  | -2147483641      |
-|TSDB_CODE_RPC_MISMATCHED_LINK_ID|	0|	 0x0008	| "Mismatched meter id"|	-2147483640|
+| TSDB_CODE_RPC_MISMATCHED_LINK_ID        |  0   |       0x0008       | "Mismatched meter id"                        | -2147483640      |
-|TSDB_CODE_RPC_TOO_SLOW|	0	| 0x0009	| "Processing of request timed out"|	-2147483639|
+| TSDB_CODE_RPC_TOO_SLOW                  |  0   |       0x0009       | "Processing of request timed out"            | -2147483639      |
-|TSDB_CODE_RPC_MAX_SESSIONS|	0	| 0x000A	| "Number of sessions reached limit"|	-2147483638|
+| TSDB_CODE_RPC_MAX_SESSIONS              |  0   |       0x000A       | "Number of sessions reached limit"           | -2147483638      |
-|TSDB_CODE_RPC_NETWORK_UNAVAIL|	0	 |0x000B	| "Unable to establish connection"	|-2147483637|
+| TSDB_CODE_RPC_NETWORK_UNAVAIL           |  0   |       0x000B       | "Unable to establish connection"             | -2147483637      |
-|TSDB_CODE_RPC_APP_ERROR|	0|	 0x000C	| "Unexpected generic error in RPC"|	-2147483636|
+| TSDB_CODE_RPC_APP_ERROR                 |  0   |       0x000C       | "Unexpected generic error in RPC"            | -2147483636      |
-|TSDB_CODE_RPC_UNEXPECTED_RESPONSE|	0	 |0x000D	| "Unexpected response"|	-2147483635|
+| TSDB_CODE_RPC_UNEXPECTED_RESPONSE       |  0   |       0x000D       | "Unexpected response"                        | -2147483635      |
-|TSDB_CODE_RPC_INVALID_VALUE|	0	| 0x000E	| "Invalid value"|	-2147483634|
+| TSDB_CODE_RPC_INVALID_VALUE             |  0   |       0x000E       | "Invalid value"                              | -2147483634      |
-|TSDB_CODE_RPC_INVALID_TRAN_ID|	0	| 0x000F	| "Invalid transaction id"|	-2147483633|
+| TSDB_CODE_RPC_INVALID_TRAN_ID           |  0   |       0x000F       | "Invalid transaction id"                     | -2147483633      |
-|TSDB_CODE_RPC_INVALID_SESSION_ID|	0|	 0x0010	| "Invalid session id"|	-2147483632|
+| TSDB_CODE_RPC_INVALID_SESSION_ID        |  0   |       0x0010       | "Invalid session id"                         | -2147483632      |
-|TSDB_CODE_RPC_INVALID_MSG_TYPE|	0|	 0x0011|	 "Invalid message type"|	-2147483631|
+| TSDB_CODE_RPC_INVALID_MSG_TYPE          |  0   |       0x0011       | "Invalid message type"                       | -2147483631      |
-|TSDB_CODE_RPC_INVALID_RESPONSE_TYPE|	0	| 0x0012|	 "Invalid response type"|	-2147483630|
+| TSDB_CODE_RPC_INVALID_RESPONSE_TYPE     |  0   |       0x0012       | "Invalid response type"                      | -2147483630      |
-|TSDB_CODE_RPC_INVALID_TIME_STAMP|	0|	 0x0013|	 "Invalid timestamp"|	-2147483629|
+| TSDB_CODE_RPC_INVALID_TIME_STAMP        |  0   |       0x0013       | "Invalid timestamp"                          | -2147483629      |
-|TSDB_CODE_COM_OPS_NOT_SUPPORT|	0	| 0x0100|	 "Operation not supported"|	-2147483392|
+| TSDB_CODE_COM_OPS_NOT_SUPPORT           |  0   |       0x0100       | "Operation not supported"                    | -2147483392      |
-|TSDB_CODE_COM_MEMORY_CORRUPTED	|0|	 0x0101	| "Memory corrupted"|	-2147483391|
+| TSDB_CODE_COM_MEMORY_CORRUPTED          |  0   |       0x0101       | "Memory corrupted"                           | -2147483391      |
-|TSDB_CODE_COM_OUT_OF_MEMORY|	0|	 0x0102|	 "Out of memory"|	-2147483390|
+| TSDB_CODE_COM_OUT_OF_MEMORY             |  0   |       0x0102       | "Out of memory"                              | -2147483390      |
-|TSDB_CODE_COM_INVALID_CFG_MSG|	0	| 0x0103|	 "Invalid config message"|	-2147483389|
+| TSDB_CODE_COM_INVALID_CFG_MSG           |  0   |       0x0103       | "Invalid config message"                     | -2147483389      |
-|TSDB_CODE_COM_FILE_CORRUPTED|	0|	 0x0104|	 "Data file corrupted"	|-2147483388|
+| TSDB_CODE_COM_FILE_CORRUPTED            |  0   |       0x0104       | "Data file corrupted"                        | -2147483388      |
-|TSDB_CODE_TSC_INVALID_SQL|	0|	 0x0200	| "Invalid SQL statement"|	-2147483136|
+| TSDB_CODE_TSC_INVALID_SQL               |  0   |       0x0200       | "Invalid SQL statement"                      | -2147483136      |
-|TSDB_CODE_TSC_INVALID_QHANDLE|	0	| 0x0201	| "Invalid qhandle"|	-2147483135|
+| TSDB_CODE_TSC_INVALID_QHANDLE           |  0   |       0x0201       | "Invalid qhandle"                            | -2147483135      |
-|TSDB_CODE_TSC_INVALID_TIME_STAMP|	0	| 0x0202	| "Invalid combination of client/service time"|	-2147483134|
+| TSDB_CODE_TSC_INVALID_TIME_STAMP        |  0   |       0x0202       | "Invalid combination of client/service time" | -2147483134      |
-|TSDB_CODE_TSC_INVALID_VALUE|	0	| 0x0203|	 "Invalid value in client"|	-2147483133|
+| TSDB_CODE_TSC_INVALID_VALUE             |  0   |       0x0203       | "Invalid value in client"                    | -2147483133      |
-|TSDB_CODE_TSC_INVALID_VERSION|	0	| 0x0204	| "Invalid client version"	|-2147483132|
+| TSDB_CODE_TSC_INVALID_VERSION           |  0   |       0x0204       | "Invalid client version"                     | -2147483132      |
-|TSDB_CODE_TSC_INVALID_IE|	0	| 0x0205	| "Invalid client ie"	|-2147483131|
+| TSDB_CODE_TSC_INVALID_IE                |  0   |       0x0205       | "Invalid client ie"                          | -2147483131      |
-|TSDB_CODE_TSC_INVALID_FQDN|	0	| 0x0206|	 "Invalid host name"|	-2147483130|
+| TSDB_CODE_TSC_INVALID_FQDN              |  0   |       0x0206       | "Invalid host name"                          | -2147483130      |
-|TSDB_CODE_TSC_INVALID_USER_LENGTH|	0	| 0x0207|	 "Invalid user name"|	-2147483129|
+| TSDB_CODE_TSC_INVALID_USER_LENGTH       |  0   |       0x0207       | "Invalid user name"                          | -2147483129      |
-|TSDB_CODE_TSC_INVALID_PASS_LENGTH|	0	| 0x0208	| "Invalid password"|	-2147483128|
+| TSDB_CODE_TSC_INVALID_PASS_LENGTH       |  0   |       0x0208       | "Invalid password"                           | -2147483128      |
-|TSDB_CODE_TSC_INVALID_DB_LENGTH|	0	| 0x0209|	 "Database name too long"|	-2147483127|
+| TSDB_CODE_TSC_INVALID_DB_LENGTH         |  0   |       0x0209       | "Database name too long"                     | -2147483127      |
-|TSDB_CODE_TSC_INVALID_TABLE_ID_LENGTH|	0	| 0x020A	| "Table name too long"|	-2147483126|
+| TSDB_CODE_TSC_INVALID_TABLE_ID_LENGTH   |  0   |       0x020A       | "Table name too long"                        | -2147483126      |
-|TSDB_CODE_TSC_INVALID_CONNECTION|	0	| 0x020B|	 "Invalid connection"|	-2147483125|
+| TSDB_CODE_TSC_INVALID_CONNECTION        |  0   |       0x020B       | "Invalid connection"                         | -2147483125      |
-|TSDB_CODE_TSC_OUT_OF_MEMORY|	0	| 0x020C	| "System out of memory"	|-2147483124|
+| TSDB_CODE_TSC_OUT_OF_MEMORY             |  0   |       0x020C       | "System out of memory"                       | -2147483124      |
-|TSDB_CODE_TSC_NO_DISKSPACE|	0	| 0x020D	| "System out of disk space"|	-2147483123|
+| TSDB_CODE_TSC_NO_DISKSPACE              |  0   |       0x020D       | "System out of disk space"                   | -2147483123      |
-|TSDB_CODE_TSC_QUERY_CACHE_ERASED|	0	| 0x020E|	 "Query cache erased"|	-2147483122|
+| TSDB_CODE_TSC_QUERY_CACHE_ERASED        |  0   |       0x020E       | "Query cache erased"                         | -2147483122      |
-|TSDB_CODE_TSC_QUERY_CANCELLED|	0	| 0x020F	 |"Query terminated"|	-2147483121|
+| TSDB_CODE_TSC_QUERY_CANCELLED           |  0   |       0x020F       | "Query terminated"                           | -2147483121      |
-|TSDB_CODE_TSC_SORTED_RES_TOO_MANY|	0	 |0x0210	| "Result set too large to be sorted"|	-2147483120|
+| TSDB_CODE_TSC_SORTED_RES_TOO_MANY       |  0   |       0x0210       | "Result set too large to be sorted"          | -2147483120      |
-|TSDB_CODE_TSC_APP_ERROR|	0	| 0x0211	| "Application error"|	-2147483119|
+| TSDB_CODE_TSC_APP_ERROR                 |  0   |       0x0211       | "Application error"                          | -2147483119      |
-|TSDB_CODE_TSC_ACTION_IN_PROGRESS|	0	 |0x0212	| "Action in progress"|	-2147483118|
+| TSDB_CODE_TSC_ACTION_IN_PROGRESS        |  0   |       0x0212       | "Action in progress"                         | -2147483118      |
-|TSDB_CODE_TSC_DISCONNECTED|	0	| 0x0213	 |"Disconnected from service"	|-2147483117|
+| TSDB_CODE_TSC_DISCONNECTED              |  0   |       0x0213       | "Disconnected from service"                  | -2147483117      |
-|TSDB_CODE_TSC_NO_WRITE_AUTH|	0	| 0x0214	| "No write permission"	|-2147483116|
+| TSDB_CODE_TSC_NO_WRITE_AUTH             |  0   |       0x0214       | "No write permission"                        | -2147483116      |
-|TSDB_CODE_MND_MSG_NOT_PROCESSED|	0|	 0x0300|	 "Message not processed"|	-2147482880|
+| TSDB_CODE_MND_MSG_NOT_PROCESSED         |  0   |       0x0300       | "Message not processed"                      | -2147482880      |
-|TSDB_CODE_MND_ACTION_IN_PROGRESS|	0	| 0x0301	 |"Message is progressing"|	-2147482879|
+| TSDB_CODE_MND_ACTION_IN_PROGRESS        |  0   |       0x0301       | "Message is progressing"                     | -2147482879      |
-|TSDB_CODE_MND_ACTION_NEED_REPROCESSED|	0	| 0x0302	 |"Messag need to be reprocessed"|	-2147482878|
+| TSDB_CODE_MND_ACTION_NEED_REPROCESSED   |  0   |       0x0302       | "Messag need to be reprocessed"              | -2147482878      |
-|TSDB_CODE_MND_NO_RIGHTS|	0	| 0x0303|	 "Insufficient privilege for operation"|	-2147482877|
+| TSDB_CODE_MND_NO_RIGHTS                 |  0   |       0x0303       | "Insufficient privilege for operation"       | -2147482877      |
-|TSDB_CODE_MND_APP_ERROR|	0	| 0x0304	| "Unexpected generic error in mnode"|	-2147482876|
+| TSDB_CODE_MND_APP_ERROR                 |  0   |       0x0304       | "Unexpected generic error in mnode"          | -2147482876      |
-|TSDB_CODE_MND_INVALID_CONNECTION|	0	| 0x0305	| "Invalid message connection"|	-2147482875|
+| TSDB_CODE_MND_INVALID_CONNECTION        |  0   |       0x0305       | "Invalid message connection"                 | -2147482875      |
-|TSDB_CODE_MND_INVALID_MSG_VERSION|	0	| 0x0306	| "Incompatible protocol version"|	-2147482874|
+| TSDB_CODE_MND_INVALID_MSG_VERSION       |  0   |       0x0306       | "Incompatible protocol version"              | -2147482874      |
-|TSDB_CODE_MND_INVALID_MSG_LEN|	0|	 0x0307	| "Invalid message length"|	-2147482873|
+| TSDB_CODE_MND_INVALID_MSG_LEN           |  0   |       0x0307       | "Invalid message length"                     | -2147482873      |
-|TSDB_CODE_MND_INVALID_MSG_TYPE|	0	| 0x0308	| "Invalid message type"	|-2147482872|
+| TSDB_CODE_MND_INVALID_MSG_TYPE          |  0   |       0x0308       | "Invalid message type"                       | -2147482872      |
-|TSDB_CODE_MND_TOO_MANY_SHELL_CONNS|	0	 |0x0309	| "Too many connections"|	-2147482871|
+| TSDB_CODE_MND_TOO_MANY_SHELL_CONNS      |  0   |       0x0309       | "Too many connections"                       | -2147482871      |
-|TSDB_CODE_MND_OUT_OF_MEMORY|	0	 |0x030A	| "Out of memory in mnode"|	-2147482870|
+| TSDB_CODE_MND_OUT_OF_MEMORY             |  0   |       0x030A       | "Out of memory in mnode"                     | -2147482870      |
-|TSDB_CODE_MND_INVALID_SHOWOBJ|	0	| 0x030B	 |"Data expired"|	-2147482869|
+| TSDB_CODE_MND_INVALID_SHOWOBJ           |  0   |       0x030B       | "Data expired"                               | -2147482869      |
-|TSDB_CODE_MND_INVALID_QUERY_ID	|0	| 0x030C	 |"Invalid query id"	|-2147482868|
+| TSDB_CODE_MND_INVALID_QUERY_ID          |  0   |       0x030C       | "Invalid query id"                           | -2147482868      |
-|TSDB_CODE_MND_INVALID_STREAM_ID|	0	 |0x030D	| "Invalid stream id"|	-2147482867|
+| TSDB_CODE_MND_INVALID_STREAM_ID         |  0   |       0x030D       | "Invalid stream id"                          | -2147482867      |
-|TSDB_CODE_MND_INVALID_CONN_ID|	0|	 0x030E	| "Invalid connection id"	|-2147482866|
+| TSDB_CODE_MND_INVALID_CONN_ID           |  0   |       0x030E       | "Invalid connection id"                      | -2147482866      |
-|TSDB_CODE_MND_SDB_OBJ_ALREADY_THERE|	0	| 0x0320|	 "Object already there"|	-2147482848|
+| TSDB_CODE_MND_SDB_OBJ_ALREADY_THERE     |  0   |       0x0320       | "Object already there"                       | -2147482848      |
-|TSDB_CODE_MND_SDB_ERROR|	0	 |0x0321	| "Unexpected generic error in sdb"	|-2147482847|
+| TSDB_CODE_MND_SDB_ERROR                 |  0   |       0x0321       | "Unexpected generic error in sdb"            | -2147482847      |
-|TSDB_CODE_MND_SDB_INVALID_TABLE_TYPE|	0	| 0x0322|	 "Invalid table type"	|-2147482846|
+| TSDB_CODE_MND_SDB_INVALID_TABLE_TYPE    |  0   |       0x0322       | "Invalid table type"                         | -2147482846      |
-|TSDB_CODE_MND_SDB_OBJ_NOT_THERE|	0	| 0x0323	 |"Object not there"	|-2147482845|
+| TSDB_CODE_MND_SDB_OBJ_NOT_THERE         |  0   |       0x0323       | "Object not there"                           | -2147482845      |
-|TSDB_CODE_MND_SDB_INVAID_META_ROW|	0	| 0x0324|	 "Invalid meta row"	|-2147482844|
+| TSDB_CODE_MND_SDB_INVAID_META_ROW       |  0   |       0x0324       | "Invalid meta row"                           | -2147482844      |
-|TSDB_CODE_MND_SDB_INVAID_KEY_TYPE|	0	| 0x0325	 |"Invalid key type"	|-2147482843|
+| TSDB_CODE_MND_SDB_INVAID_KEY_TYPE       |  0   |       0x0325       | "Invalid key type"                           | -2147482843      |
-|TSDB_CODE_MND_DNODE_ALREADY_EXIST|	0	| 0x0330	| "DNode already exists"|	-2147482832|
+| TSDB_CODE_MND_DNODE_ALREADY_EXIST       |  0   |       0x0330       | "DNode already exists"                       | -2147482832      |
-|TSDB_CODE_MND_DNODE_NOT_EXIST|	0	| 0x0331|	 "DNode does not exist"	|-2147482831|
+| TSDB_CODE_MND_DNODE_NOT_EXIST           |  0   |       0x0331       | "DNode does not exist"                       | -2147482831      |
-|TSDB_CODE_MND_VGROUP_NOT_EXIST|	0	| 0x0332	 |"VGroup does not exist"|	-2147482830|
+| TSDB_CODE_MND_VGROUP_NOT_EXIST          |  0   |       0x0332       | "VGroup does not exist"                      | -2147482830      |
-|TSDB_CODE_MND_NO_REMOVE_MASTER	|0	| 0x0333	| "Master DNode cannot be removed"|	-2147482829|
+| TSDB_CODE_MND_NO_REMOVE_MASTER          |  0   |       0x0333       | "Master DNode cannot be removed"             | -2147482829      |
-|TSDB_CODE_MND_NO_ENOUGH_DNODES	|0	| 0x0334|	 "Out of DNodes"|	-2147482828|
+| TSDB_CODE_MND_NO_ENOUGH_DNODES          |  0   |       0x0334       | "Out of DNodes"                              | -2147482828      |
-|TSDB_CODE_MND_CLUSTER_CFG_INCONSISTENT	|0	| 0x0335	| "Cluster cfg inconsistent"|	-2147482827|
+| TSDB_CODE_MND_CLUSTER_CFG_INCONSISTENT  |  0   |       0x0335       | "Cluster cfg inconsistent"                   | -2147482827      |
-|TSDB_CODE_MND_INVALID_DNODE_CFG_OPTION|	0	| 0x0336	| "Invalid dnode cfg option"|	-2147482826|
+| TSDB_CODE_MND_INVALID_DNODE_CFG_OPTION  |  0   |       0x0336       | "Invalid dnode cfg option"                   | -2147482826      |
-|TSDB_CODE_MND_BALANCE_ENABLED|	0	| 0x0337	| "Balance already enabled"	|-2147482825|
+| TSDB_CODE_MND_BALANCE_ENABLED           |  0   |       0x0337       | "Balance already enabled"                    | -2147482825      |
-|TSDB_CODE_MND_VGROUP_NOT_IN_DNODE|	0	 |0x0338	| "Vgroup not in dnode"|	-2147482824|
+| TSDB_CODE_MND_VGROUP_NOT_IN_DNODE       |  0   |       0x0338       | "Vgroup not in dnode"                        | -2147482824      |
-|TSDB_CODE_MND_VGROUP_ALREADY_IN_DNODE|	0	| 0x0339	| "Vgroup already in dnode"|	-2147482823|
+| TSDB_CODE_MND_VGROUP_ALREADY_IN_DNODE   |  0   |       0x0339       | "Vgroup already in dnode"                    | -2147482823      |
-|TSDB_CODE_MND_DNODE_NOT_FREE	|0	| 0x033A	 |"Dnode not avaliable"|	-2147482822|
+| TSDB_CODE_MND_DNODE_NOT_FREE            |  0   |       0x033A       | "Dnode not avaliable"                        | -2147482822      |
-|TSDB_CODE_MND_INVALID_CLUSTER_ID	|0	 |0x033B	| "Cluster id not match"|	-2147482821|
+| TSDB_CODE_MND_INVALID_CLUSTER_ID        |  0   |       0x033B       | "Cluster id not match"                       | -2147482821      |
-|TSDB_CODE_MND_NOT_READY|	0	| 0x033C	 |"Cluster not ready"|	-2147482820|
+| TSDB_CODE_MND_NOT_READY                 |  0   |       0x033C       | "Cluster not ready"                          | -2147482820      |
-|TSDB_CODE_MND_ACCT_ALREADY_EXIST|	0	| 0x0340	| "Account already exists"	|-2147482816|
+| TSDB_CODE_MND_ACCT_ALREADY_EXIST        |  0   |       0x0340       | "Account already exists"                     | -2147482816      |
-|TSDB_CODE_MND_INVALID_ACCT|	0	| 0x0341|	 "Invalid account"|	-2147482815|
+| TSDB_CODE_MND_INVALID_ACCT              |  0   |       0x0341       | "Invalid account"                            | -2147482815      |
-|TSDB_CODE_MND_INVALID_ACCT_OPTION|	0	| 0x0342	| "Invalid account options"|	-2147482814|
+| TSDB_CODE_MND_INVALID_ACCT_OPTION       |  0   |       0x0342       | "Invalid account options"                    | -2147482814      |
-|TSDB_CODE_MND_USER_ALREADY_EXIST|	0	| 0x0350	| "User already exists"|	-2147482800|
+| TSDB_CODE_MND_USER_ALREADY_EXIST        |  0   |       0x0350       | "User already exists"                        | -2147482800      |
-|TSDB_CODE_MND_INVALID_USER	|0	| 0x0351	| "Invalid user"	|-2147482799|
+| TSDB_CODE_MND_INVALID_USER              |  0   |       0x0351       | "Invalid user"                               | -2147482799      |
-|TSDB_CODE_MND_INVALID_USER_FORMAT| 0	 |0x0352	 |"Invalid user format"	|-2147482798|
+| TSDB_CODE_MND_INVALID_USER_FORMAT       |  0   |       0x0352       | "Invalid user format"                        | -2147482798      |
-|TSDB_CODE_MND_INVALID_PASS_FORMAT|	0|	 0x0353	| "Invalid password format"|	-2147482797|
+| TSDB_CODE_MND_INVALID_PASS_FORMAT       |  0   |       0x0353       | "Invalid password format"                    | -2147482797      |
-|TSDB_CODE_MND_NO_USER_FROM_CONN|	0	| 0x0354	| "Can not get user from conn"|	-2147482796|
+| TSDB_CODE_MND_NO_USER_FROM_CONN         |  0   |       0x0354       | "Can not get user from conn"                 | -2147482796      |
-|TSDB_CODE_MND_TOO_MANY_USERS|	0	| 0x0355|	 "Too many users"|	-2147482795|
+| TSDB_CODE_MND_TOO_MANY_USERS            |  0   |       0x0355       | "Too many users"                             | -2147482795      |
-|TSDB_CODE_MND_TABLE_ALREADY_EXIST|	0|	0x0360|	 "Table already exists"|	-2147482784|
+| TSDB_CODE_MND_TABLE_ALREADY_EXIST       |  0   |       0x0360       | "Table already exists"                       | -2147482784      |
-|TSDB_CODE_MND_INVALID_TABLE_ID|	0|	 0x0361|	 "Table name too long"|	-2147482783|
+| TSDB_CODE_MND_INVALID_TABLE_ID          |  0   |       0x0361       | "Table name too long"                        | -2147482783      |
-|TSDB_CODE_MND_INVALID_TABLE_NAME|	0|	 0x0362	| "Table does not exist"|	-2147482782|
+| TSDB_CODE_MND_INVALID_TABLE_NAME        |  0   |       0x0362       | "Table does not exist"                       | -2147482782      |
-|TSDB_CODE_MND_INVALID_TABLE_TYPE|	0|	 0x0363	| "Invalid table type in tsdb"|	-2147482781|
+| TSDB_CODE_MND_INVALID_TABLE_TYPE        |  0   |       0x0363       | "Invalid table type in tsdb"                 | -2147482781      |
-|TSDB_CODE_MND_TOO_MANY_TAGS|	0	| 0x0364|	 "Too many tags"|	-2147482780|
+| TSDB_CODE_MND_TOO_MANY_TAGS             |  0   |       0x0364       | "Too many tags"                              | -2147482780      |
-|TSDB_CODE_MND_TOO_MANY_TIMESERIES|	0|	 0x0366|	 "Too many time series"|	-2147482778|
+| TSDB_CODE_MND_TOO_MANY_TIMESERIES       |  0   |       0x0366       | "Too many time series"                       | -2147482778      |
-|TSDB_CODE_MND_NOT_SUPER_TABLE|	0	 |0x0367|	 "Not super table"| 	-2147482777|
+| TSDB_CODE_MND_NOT_SUPER_TABLE           |  0   |       0x0367       | "Not super table"                            | -2147482777      |
-|TSDB_CODE_MND_COL_NAME_TOO_LONG|	0|	 0x0368|	 "Tag name too long"|	-2147482776|
+| TSDB_CODE_MND_COL_NAME_TOO_LONG         |  0   |       0x0368       | "Tag name too long"                          | -2147482776      |
-|TSDB_CODE_MND_TAG_ALREAY_EXIST|	0|	 0x0369|	 "Tag already exists"|	-2147482775|
+| TSDB_CODE_MND_TAG_ALREAY_EXIST          |  0   |       0x0369       | "Tag already exists"                         | -2147482775      |
-|TSDB_CODE_MND_TAG_NOT_EXIST|	0	 |0x036A	| "Tag does not exist"	|-2147482774|
+| TSDB_CODE_MND_TAG_NOT_EXIST             |  0   |       0x036A       | "Tag does not exist"                         | -2147482774      |
-|TSDB_CODE_MND_FIELD_ALREAY_EXIST|	0	| 0x036B|	 "Field already exists"|	-2147482773|
+| TSDB_CODE_MND_FIELD_ALREAY_EXIST        |  0   |       0x036B       | "Field already exists"                       | -2147482773      |
-|TSDB_CODE_MND_FIELD_NOT_EXIST|	0	| 0x036C	| "Field does not exist"|	-2147482772|
+| TSDB_CODE_MND_FIELD_NOT_EXIST           |  0   |       0x036C       | "Field does not exist"                       | -2147482772      |
-|TSDB_CODE_MND_INVALID_STABLE_NAME	|0	| 0x036D	 |"Super table does not exist"	|-2147482771|
+| TSDB_CODE_MND_INVALID_STABLE_NAME       |  0   |       0x036D       | "Super table does not exist"                 | -2147482771      |
-|TSDB_CODE_MND_DB_NOT_SELECTED|	0	| 0x0380	| "Database not specified or available"|	-2147482752|
+| TSDB_CODE_MND_DB_NOT_SELECTED           |  0   |       0x0380       | "Database not specified or available"        | -2147482752      |
-|TSDB_CODE_MND_DB_ALREADY_EXIST|	0	| 0x0381	| "Database already exists"|	-2147482751|
+| TSDB_CODE_MND_DB_ALREADY_EXIST          |  0   |       0x0381       | "Database already exists"                    | -2147482751      |
-|TSDB_CODE_MND_INVALID_DB_OPTION|	0	| 0x0382	| "Invalid database options"|	-2147482750|
+| TSDB_CODE_MND_INVALID_DB_OPTION         |  0   |       0x0382       | "Invalid database options"                   | -2147482750      |
-|TSDB_CODE_MND_INVALID_DB|	0	| 0x0383	| "Invalid database name"|	-2147482749|
+| TSDB_CODE_MND_INVALID_DB                |  0   |       0x0383       | "Invalid database name"                      | -2147482749      |
-|TSDB_CODE_MND_MONITOR_DB_FORBIDDEN|	0	| 0x0384	| "Cannot delete monitor database"|	-2147482748|
+| TSDB_CODE_MND_MONITOR_DB_FORBIDDEN      |  0   |       0x0384       | "Cannot delete monitor database"             | -2147482748      |
-|TSDB_CODE_MND_TOO_MANY_DATABASES|	0|	 0x0385	| "Too many databases for account"|	-2147482747|
+| TSDB_CODE_MND_TOO_MANY_DATABASES        |  0   |       0x0385       | "Too many databases for account"             | -2147482747      |
-|TSDB_CODE_MND_DB_IN_DROPPING|	0	| 0x0386|	 "Database not available"	|-2147482746|
+| TSDB_CODE_MND_DB_IN_DROPPING            |  0   |       0x0386       | "Database not available"                     | -2147482746      |
-|TSDB_CODE_DND_MSG_NOT_PROCESSED|	0|	 0x0400	| "Message not processed"|	-2147482624|
+| TSDB_CODE_DND_MSG_NOT_PROCESSED         |  0   |       0x0400       | "Message not processed"                      | -2147482624      |
-|TSDB_CODE_DND_OUT_OF_MEMORY	|0	| 0x0401	| "Dnode out of memory"|	-2147482623|
+| TSDB_CODE_DND_OUT_OF_MEMORY             |  0   |       0x0401       | "Dnode out of memory"                        | -2147482623      |
-|TSDB_CODE_DND_NO_WRITE_ACCESS|	0	| 0x0402	| "No permission for disk files in dnode"|	-2147482622|
+| TSDB_CODE_DND_NO_WRITE_ACCESS           |  0   |       0x0402       | "No permission for disk files in dnode"      | -2147482622      |
-|TSDB_CODE_DND_INVALID_MSG_LEN|	0	| 0x0403	| "Invalid message length"|	-2147482621|
+| TSDB_CODE_DND_INVALID_MSG_LEN           |  0   |       0x0403       | "Invalid message length"                     | -2147482621      |
-|TSDB_CODE_VND_ACTION_IN_PROGRESS	|0	 |0x0500|	 "Action in progress"	|-2147482368|
+| TSDB_CODE_VND_ACTION_IN_PROGRESS        |  0   |       0x0500       | "Action in progress"                         | -2147482368      |
-|TSDB_CODE_VND_MSG_NOT_PROCESSED|	0	 |0x0501	| "Message not processed"	|-2147482367|
+| TSDB_CODE_VND_MSG_NOT_PROCESSED         |  0   |       0x0501       | "Message not processed"                      | -2147482367      |
-|TSDB_CODE_VND_ACTION_NEED_REPROCESSED	|0	 |0x0502|	 "Action need to be reprocessed"|	-2147482366|
+| TSDB_CODE_VND_ACTION_NEED_REPROCESSED   |  0   |       0x0502       | "Action need to be reprocessed"              | -2147482366      |
-|TSDB_CODE_VND_INVALID_VGROUP_ID	|0	| 0x0503|	 "Invalid Vgroup ID"|	-2147482365|
+| TSDB_CODE_VND_INVALID_VGROUP_ID         |  0   |       0x0503       | "Invalid Vgroup ID"                          | -2147482365      |
-|TSDB_CODE_VND_INIT_FAILED|	0	| 0x0504	| "Vnode initialization failed"|	-2147482364|
+| TSDB_CODE_VND_INIT_FAILED               |  0   |       0x0504       | "Vnode initialization failed"                | -2147482364      |
-|TSDB_CODE_VND_NO_DISKSPACE|	0	 |0x0505|	 "System out of disk space"	|-2147482363|
+| TSDB_CODE_VND_NO_DISKSPACE              |  0   |       0x0505       | "System out of disk space"                   | -2147482363      |
-|TSDB_CODE_VND_NO_DISK_PERMISSIONS|	0	| 0x0506|	 "No write permission for disk files"	|-2147482362|
+| TSDB_CODE_VND_NO_DISK_PERMISSIONS       |  0   |       0x0506       | "No write permission for disk files"         | -2147482362      |
-|TSDB_CODE_VND_NO_SUCH_FILE_OR_DIR|	0	| 0x0507	| "Missing data file"|	-2147482361|
+| TSDB_CODE_VND_NO_SUCH_FILE_OR_DIR       |  0   |       0x0507       | "Missing data file"                          | -2147482361      |
-|TSDB_CODE_VND_OUT_OF_MEMORY	|0|	 0x0508	| "Out of memory"|	-2147482360|
+| TSDB_CODE_VND_OUT_OF_MEMORY             |  0   |       0x0508       | "Out of memory"                              | -2147482360      |
-|TSDB_CODE_VND_APP_ERROR|	0|	 0x0509	| "Unexpected generic error in vnode"|	-2147482359|
+| TSDB_CODE_VND_APP_ERROR                 |  0   |       0x0509       | "Unexpected generic error in vnode"          | -2147482359      |
-|TSDB_CODE_VND_INVALID_STATUS	|0|	 0x0510	| "Database not ready"|	-2147482352|
+| TSDB_CODE_VND_INVALID_STATUS            |  0   |       0x0510       | "Database not ready"                         | -2147482352      |
-|TSDB_CODE_VND_NOT_SYNCED|	0	| 0x0511	| "Database suspended"|	-2147482351|
+| TSDB_CODE_VND_NOT_SYNCED                |  0   |       0x0511       | "Database suspended"                         | -2147482351      |
-|TSDB_CODE_VND_NO_WRITE_AUTH|	0	| 0x0512|	 "Write operation denied"	|-2147482350|
+| TSDB_CODE_VND_NO_WRITE_AUTH             |  0   |       0x0512       | "Write operation denied"                     | -2147482350      |
-|TSDB_CODE_TDB_INVALID_TABLE_ID	|0	| 0x0600	| "Invalid table ID"|	-2147482112|
+| TSDB_CODE_TDB_INVALID_TABLE_ID          |  0   |       0x0600       | "Invalid table ID"                           | -2147482112      |
-|TSDB_CODE_TDB_INVALID_TABLE_TYPE|	0|	 0x0601	 |"Invalid table type"|	-2147482111|
+| TSDB_CODE_TDB_INVALID_TABLE_TYPE        |  0   |       0x0601       | "Invalid table type"                         | -2147482111      |
-|TSDB_CODE_TDB_IVD_TB_SCHEMA_VERSION|	0|	 0x0602|	 "Invalid table schema version"|	-2147482110|
+| TSDB_CODE_TDB_IVD_TB_SCHEMA_VERSION     |  0   |       0x0602       | "Invalid table schema version"               | -2147482110      |
-|TSDB_CODE_TDB_TABLE_ALREADY_EXIST|	0	| 0x0603|	 "Table already exists"|	-2147482109|
+| TSDB_CODE_TDB_TABLE_ALREADY_EXIST       |  0   |       0x0603       | "Table already exists"                       | -2147482109      |
-|TSDB_CODE_TDB_INVALID_CONFIG|	0	| 0x0604|	 "Invalid configuration"|	-2147482108|
+| TSDB_CODE_TDB_INVALID_CONFIG            |  0   |       0x0604       | "Invalid configuration"                      | -2147482108      |
-|TSDB_CODE_TDB_INIT_FAILED|	0	| 0x0605|	 "Tsdb init failed"|	-2147482107|
+| TSDB_CODE_TDB_INIT_FAILED               |  0   |       0x0605       | "Tsdb init failed"                           | -2147482107      |
-|TSDB_CODE_TDB_NO_DISKSPACE|	0	| 0x0606|	 "No diskspace for tsdb"|	-2147482106|
+| TSDB_CODE_TDB_NO_DISKSPACE              |  0   |       0x0606       | "No diskspace for tsdb"                      | -2147482106      |
-|TSDB_CODE_TDB_NO_DISK_PERMISSIONS|	0	| 0x0607|	 "No permission for disk files"|	-2147482105|
+| TSDB_CODE_TDB_NO_DISK_PERMISSIONS       |  0   |       0x0607       | "No permission for disk files"               | -2147482105      |
-|TSDB_CODE_TDB_FILE_CORRUPTED|	0	| 0x0608|	 "Data file(s) corrupted"|	-2147482104|
+| TSDB_CODE_TDB_FILE_CORRUPTED            |  0   |       0x0608       | "Data file(s) corrupted"                     | -2147482104      |
-|TSDB_CODE_TDB_OUT_OF_MEMORY|	0	| 0x0609|	 "Out of memory"|	-2147482103|
+| TSDB_CODE_TDB_OUT_OF_MEMORY             |  0   |       0x0609       | "Out of memory"                              | -2147482103      |
-|TSDB_CODE_TDB_TAG_VER_OUT_OF_DATE|	0	| 0x060A|	 "Tag too old"|	-2147482102|
+| TSDB_CODE_TDB_TAG_VER_OUT_OF_DATE       |  0   |       0x060A       | "Tag too old"                                | -2147482102      |
-|TSDB_CODE_TDB_TIMESTAMP_OUT_OF_RANGE	|0|	 0x060B	| "Timestamp data out of range"|	-2147482101|
+| TSDB_CODE_TDB_TIMESTAMP_OUT_OF_RANGE    |  0   |       0x060B       | "Timestamp data out of range"                | -2147482101      |
-|TSDB_CODE_TDB_SUBMIT_MSG_MSSED_UP|	0|	 0x060C|	 "Submit message is messed up"|	-2147482100|
+| TSDB_CODE_TDB_SUBMIT_MSG_MSSED_UP       |  0   |       0x060C       | "Submit message is messed up"                | -2147482100      |
-|TSDB_CODE_TDB_INVALID_ACTION|	0	| 0x060D	| "Invalid operation"|	-2147482099|
+| TSDB_CODE_TDB_INVALID_ACTION            |  0   |       0x060D       | "Invalid operation"                          | -2147482099      |
-|TSDB_CODE_TDB_INVALID_CREATE_TB_MSG|	0	| 0x060E|	 "Invalid creation of table"|	-2147482098|
+| TSDB_CODE_TDB_INVALID_CREATE_TB_MSG     |  0   |       0x060E       | "Invalid creation of table"                  | -2147482098      |
-|TSDB_CODE_TDB_NO_TABLE_DATA_IN_MEM|	0	| 0x060F|	 "No table data in memory skiplist"	|-2147482097|
+| TSDB_CODE_TDB_NO_TABLE_DATA_IN_MEM      |  0   |       0x060F       | "No table data in memory skiplist"           | -2147482097      |
-|TSDB_CODE_TDB_FILE_ALREADY_EXISTS|	0	| 0x0610|	 "File already exists"|	-2147482096|
+| TSDB_CODE_TDB_FILE_ALREADY_EXISTS       |  0   |       0x0610       | "File already exists"                        | -2147482096      |
-|TSDB_CODE_TDB_TABLE_RECONFIGURE|	0	| 0x0611|	 "Need to reconfigure table"|	-2147482095|
+| TSDB_CODE_TDB_TABLE_RECONFIGURE         |  0   |       0x0611       | "Need to reconfigure table"                  | -2147482095      |
-|TSDB_CODE_TDB_IVD_CREATE_TABLE_INFO|	0	| 0x0612|	 "Invalid information to create table"|	-2147482094|
+| TSDB_CODE_TDB_IVD_CREATE_TABLE_INFO     |  0   |       0x0612       | "Invalid information to create table"        | -2147482094      |
-|TSDB_CODE_QRY_INVALID_QHANDLE|	0	| 0x0700|	 "Invalid handle"|	-2147481856|
+| TSDB_CODE_QRY_INVALID_QHANDLE           |  0   |       0x0700       | "Invalid handle"                             | -2147481856      |
-|TSDB_CODE_QRY_INVALID_MSG|	0	| 0x0701|	 "Invalid message"|  	-2147481855|
+| TSDB_CODE_QRY_INVALID_MSG               |  0   |       0x0701       | "Invalid message"                            | -2147481855      |
-|TSDB_CODE_QRY_NO_DISKSPACE|	0	| 0x0702	| "No diskspace for query"|	-2147481854|
+| TSDB_CODE_QRY_NO_DISKSPACE              |  0   |       0x0702       | "No diskspace for query"                     | -2147481854      |
-|TSDB_CODE_QRY_OUT_OF_MEMORY|	0	| 0x0703	| "System out of memory"|	-2147481853|
+| TSDB_CODE_QRY_OUT_OF_MEMORY             |  0   |       0x0703       | "System out of memory"                       | -2147481853      |
-|TSDB_CODE_QRY_APP_ERROR|	0	| 0x0704	| "Unexpected generic error in query"|	-2147481852|
+| TSDB_CODE_QRY_APP_ERROR                 |  0   |       0x0704       | "Unexpected generic error in query"          | -2147481852      |
-|TSDB_CODE_QRY_DUP_JOIN_KEY|	0	| 0x0705|	 "Duplicated join key"|	-2147481851|
+| TSDB_CODE_QRY_DUP_JOIN_KEY              |  0   |       0x0705       | "Duplicated join key"                        | -2147481851      |
-|TSDB_CODE_QRY_EXCEED_TAGS_LIMIT|	0	| 0x0706	| "Tag conditon too many"|	-2147481850|
+| TSDB_CODE_QRY_EXCEED_TAGS_LIMIT         |  0   |       0x0706       | "Tag conditon too many"                      | -2147481850      |
-|TSDB_CODE_QRY_NOT_READY	|0|	 0x0707	| "Query not ready"	|-2147481849|
+| TSDB_CODE_QRY_NOT_READY                 |  0   |       0x0707       | "Query not ready"                            | -2147481849      |
-|TSDB_CODE_QRY_HAS_RSP|	0	| 0x0708|	 "Query should response"|	-2147481848|
+| TSDB_CODE_QRY_HAS_RSP                   |  0   |       0x0708       | "Query should response"                      | -2147481848      |
-|TSDB_CODE_GRANT_EXPIRED|	0	| 0x0800|	 "License expired"|	-2147481600|
+| TSDB_CODE_GRANT_EXPIRED                 |  0   |       0x0800       | "License expired"                            | -2147481600      |
-|TSDB_CODE_GRANT_DNODE_LIMITED|	0	| 0x0801	| "DNode creation limited by licence"|	-2147481599|
+| TSDB_CODE_GRANT_DNODE_LIMITED           |  0   |       0x0801       | "DNode creation limited by licence"          | -2147481599      |
-|TSDB_CODE_GRANT_ACCT_LIMITED	|0|	 0x0802	 |"Account creation limited by license"|	-2147481598|
+| TSDB_CODE_GRANT_ACCT_LIMITED            |  0   |       0x0802       | "Account creation limited by license"        | -2147481598      |
-|TSDB_CODE_GRANT_TIMESERIES_LIMITED|	0	| 0x0803	| "Table creation limited by license"|	-2147481597|
+| TSDB_CODE_GRANT_TIMESERIES_LIMITED      |  0   |       0x0803       | "Table creation limited by license"          | -2147481597      |
-|TSDB_CODE_GRANT_DB_LIMITED|	0	| 0x0804	| "DB creation limited by license"|	-2147481596|
+| TSDB_CODE_GRANT_DB_LIMITED              |  0   |       0x0804       | "DB creation limited by license"             | -2147481596      |
-|TSDB_CODE_GRANT_USER_LIMITED|	0	| 0x0805	| "User creation limited by license"|	-2147481595|
+| TSDB_CODE_GRANT_USER_LIMITED            |  0   |       0x0805       | "User creation limited by license"           | -2147481595      |
-|TSDB_CODE_GRANT_CONN_LIMITED|	0|	 0x0806	| "Conn creation limited by license"	|-2147481594|
+| TSDB_CODE_GRANT_CONN_LIMITED            |  0   |       0x0806       | "Conn creation limited by license"           | -2147481594      |
-|TSDB_CODE_GRANT_STREAM_LIMITED|	0	| 0x0807	| "Stream creation limited by license"|	-2147481593|
+| TSDB_CODE_GRANT_STREAM_LIMITED          |  0   |       0x0807       | "Stream creation limited by license"         | -2147481593      |
-|TSDB_CODE_GRANT_SPEED_LIMITED|	0	| 0x0808	| "Write speed limited by license"	|-2147481592|
+| TSDB_CODE_GRANT_SPEED_LIMITED           |  0   |       0x0808       | "Write speed limited by license"             | -2147481592      |
-|TSDB_CODE_GRANT_STORAGE_LIMITED|	0	 |0x0809	| "Storage capacity limited by license"|	-2147481591|
+| TSDB_CODE_GRANT_STORAGE_LIMITED         |  0   |       0x0809       | "Storage capacity limited by license"        | -2147481591      |
-|TSDB_CODE_GRANT_QUERYTIME_LIMITED|	0	| 0x080A	| "Query time limited by license"	|-2147481590|
+| TSDB_CODE_GRANT_QUERYTIME_LIMITED       |  0   |       0x080A       | "Query time limited by license"              | -2147481590      |
-|TSDB_CODE_GRANT_CPU_LIMITED|	0	 |0x080B	 |"CPU cores limited by license"|	-2147481589|
+| TSDB_CODE_GRANT_CPU_LIMITED             |  0   |       0x080B       | "CPU cores limited by license"               | -2147481589      |
-|TSDB_CODE_SYN_INVALID_CONFIG|	0	| 0x0900|	 "Invalid Sync Configuration"|	-2147481344|
+| TSDB_CODE_SYN_INVALID_CONFIG            |  0   |       0x0900       | "Invalid Sync Configuration"                 | -2147481344      |
-|TSDB_CODE_SYN_NOT_ENABLED|	0	| 0x0901	| "Sync module not enabled"	|-2147481343|
+| TSDB_CODE_SYN_NOT_ENABLED               |  0   |       0x0901       | "Sync module not enabled"                    | -2147481343      |
-|TSDB_CODE_WAL_APP_ERROR|	0|	 0x1000	| "Unexpected generic error in wal"	|-2147479552|
+| TSDB_CODE_WAL_APP_ERROR                 |  0   |       0x1000       | "Unexpected generic error in wal"            | -2147479552      |
\ No newline at end of file
--- a/documentation20/cn/12.taos-sql/docs.md
+++ b/documentation20/cn/12.taos-sql/docs.md
@@ -41,9 +41,9 @@ TDengine 缺省的时间戳是毫秒精度，但通过修改配置参数 enableM
 在TDengine中，普通表的数据模型中可使用以下 10 种数据类型。 
-|      |   类型    | Bytes  | 说明                                                         |
+| #    | **类型**          | **Bytes** | **说明**                                                     |
 | ---- | :-------: | ------ | ------------------------------------------------------------ |
-| 1    | TIMESTAMP | 8      | 时间戳。缺省精度毫秒，可支持微秒。从格林威治时间 1970-01-01 00:00:00.000 (UTC/GMT) 开始，计时不能早于该时间。（从 2.0.18 版本开始，已经去除了这一时间范围限制） |
+| 1    | TIMESTAMP | 8      | 时间戳。缺省精度毫秒，可支持微秒。从格林威治时间 1970-01-01 00:00:00.000 (UTC/GMT) 开始，计时不能早于该时间。（从 2.0.18.0 版本开始，已经去除了这一时间范围限制） |
 | 2    |    INT    | 4      | 整型，范围 [-2^31+1,   2^31-1], -2^31 用作 NULL           |
 | 3    |  BIGINT   | 8      | 长整型，范围 [-2^63+1,   2^63-1], -2^63 用于 NULL                                 |
 | 4    |   FLOAT   | 4      | 浮点型，有效位数 6-7，范围 [-3.4E38, 3.4E38]                  |
@@ -53,6 +53,7 @@ TDengine 缺省的时间戳是毫秒精度，但通过修改配置参数 enableM
 | 8    |  TINYINT  | 1      | 单字节整型，范围 [-127, 127], -128 用于 NULL                                |
 | 9    |   BOOL    | 1      | 布尔型，{true, false}                                      |
 | 10   |   NCHAR   | 自定义 | 记录包含多字节字符在内的字符串，如中文字符。每个 nchar 字符占用 4 bytes 的存储空间。字符串两端使用单引号引用，字符串内的单引号需用转义字符 `\’`。nchar 使用时须指定字符串大小，类型为 nchar(10) 的列表示此列的字符串最多存储 10 个 nchar 字符，会固定占用 40 bytes 的空间。如果用户字符串长度超出声明长度，将会报错。 |
+<!-- REPLACE_OPEN_TO_ENTERPRISE__COLUMN_TYPE_ADDONS -->
 **Tips**:
 1. TDengine 对 SQL 语句中的英文字符不区分大小写，自动转化为小写执行。因此用户大小写敏感的字符串及密码，需要使用单引号将字符串引起来。
@@ -63,11 +64,11 @@ TDengine 缺省的时间戳是毫秒精度，但通过修改配置参数 enableM
 - **创建数据库**  
    ```mysql
-    CREATE DATABASE [IF NOT EXISTS] db_name [KEEP keep] [UPDATE 1];
+    CREATE DATABASE [IF NOT EXISTS] db_name [KEEP keep] [DAYS days] [UPDATE 1];
    ```
-    说明：
+    说明：<!-- 注意：上一行中的 SQL 语句在企业版文档中会被替换，因此修改此语句的话，需要修改企业版文档的替换字典键值！！ -->
-    1) KEEP是该数据库的数据保留多长天数，缺省是3650天(10年)，数据库会自动删除超过时限的数据；
+    1) KEEP是该数据库的数据保留多长天数，缺省是3650天(10年)，数据库会自动删除超过时限的数据；<!-- REPLACE_OPEN_TO_ENTERPRISE__KEEP_PARAM_DESCRIPTION -->
    2) UPDATE 标志数据库支持更新相同时间戳数据；
@@ -75,7 +76,7 @@ TDengine 缺省的时间戳是毫秒精度，但通过修改配置参数 enableM
    4) 一条SQL 语句的最大长度为65480个字符；
-    5) 数据库还有更多与存储相关的配置参数，请参见系统管理。
+    5) 数据库还有更多与存储相关的配置参数，请参见 [服务端配置](https://www.taosdata.com/cn/documentation/taos-sql#management) 章节。
 - **显示系统当前参数**
@@ -167,22 +168,22 @@ TDengine 缺省的时间戳是毫秒精度，但通过修改配置参数 enableM
    ```mysql
    CREATE TABLE [IF NOT EXISTS] tb_name USING stb_name TAGS (tag_value1, ...);
    ```
-    以指定的超级表为模板，指定 tags 的值来创建数据表。
+    以指定的超级表为模板，指定 TAGS 的值来创建数据表。
- **以超级表为模板创建数据表，并指定具体的 tags 列**
+- **以超级表为模板创建数据表，并指定具体的 TAGS 列**
    ```mysql
    CREATE TABLE [IF NOT EXISTS] tb_name USING stb_name (tag_name1, ...) TAGS (tag_value1, ...);
    ```
-    以指定的超级表为模板，指定一部分 tags 列的值来创建数据表。（没被指定的 tags 列会设为空值。）  
+    以指定的超级表为模板，指定一部分 TAGS 列的值来创建数据表（没被指定的 TAGS 列会设为空值）。  
-    说明：从 2.0.17 版本开始支持这种方式。在之前的版本中，不允许指定 tags 列，而必须显式给出所有 tags 列的取值。
+    说明：从 2.0.17.0 版本开始支持这种方式。在之前的版本中，不允许指定 TAGS 列，而必须显式给出所有 TAGS 列的取值。
 - **批量创建数据表**
    ```mysql
    CREATE TABLE [IF NOT EXISTS] tb_name1 USING stb_name TAGS (tag_value1, ...) tb_name2 USING stb_name TAGS (tag_value2, ...) ...;
    ```
-    以更快的速度批量创建大量数据表。（服务器端 2.0.14 及以上版本）
+    以更快的速度批量创建大量数据表（服务器端 2.0.14 及以上版本）。
    说明：
@@ -220,6 +221,7 @@ TDengine 缺省的时间戳是毫秒精度，但通过修改配置参数 enableM
    ```mysql
    SET MAX_BINARY_DISPLAY_WIDTH <nn>;
    ```
+    如显示的内容后面以...结尾时，表示该内容已被截断，可通过本命令修改显示字符宽度以显示完整的内容。
 - **获取表的结构信息**
@@ -236,14 +238,14 @@ TDengine 缺省的时间戳是毫秒精度，但通过修改配置参数 enableM
    1) 列的最大个数为1024，最小个数为2；
-    2) 列名最大长度为64；
+    2) 列名最大长度为64。
 - **表删除列**
    ```mysql
    ALTER TABLE tb_name DROP COLUMN field_name; 
    ```
-    如果表是通过[超级表](../super-table/)创建，更改表结构的操作只能对超级表进行。同时针对超级表的结构更改对所有通过该结构创建的表生效。对于不是通过超级表创建的表，可以直接修改表结构
+    如果表是通过超级表创建，更改表结构的操作只能对超级表进行。同时针对超级表的结构更改对所有通过该结构创建的表生效。对于不是通过超级表创建的表，可以直接修改表结构。
 ## <a class="anchor" id="super-table"></a>超级表STable管理
@@ -254,7 +256,7 @@ TDengine 缺省的时间戳是毫秒精度，但通过修改配置参数 enableM
    ```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]);
    ```
-    创建 STable，与创建表的 SQL 语法相似，但需指定 TAGS 字段的名称和类型
+    创建 STable，与创建表的 SQL 语法相似，但需要指定 TAGS 字段的名称和类型
    说明：
@@ -276,7 +278,7 @@ TDengine 缺省的时间戳是毫秒精度，但通过修改配置参数 enableM
 - **显示当前数据库下的所有超级表信息**
    ```mysql
-    SHOW STABLES [LIKE tb_name_wildcar];
+    SHOW STABLES [LIKE tb_name_wildcard];
    ```
    查看数据库内全部 STable，及其相关信息，包括 STable 的名称、创建时间、列数量、标签（TAG）数量、通过该 STable 建表的数量。
@@ -341,7 +343,7 @@ TDengine 缺省的时间戳是毫秒精度，但通过修改配置参数 enableM
    ```mysql
    INSERT INTO tb_name VALUES (field_value, ...);
    ```
-    向表tb_name中插入一条记录
+    向表tb_name中插入一条记录。
 - **插入一条记录，数据对应到指定的列**
    ```mysql
@@ -353,42 +355,51 @@ TDengine 缺省的时间戳是毫秒精度，但通过修改配置参数 enableM
    ```mysql
    INSERT INTO tb_name VALUES (field1_value1, ...) (field1_value2, ...) ...;
    ```
-    向表tb_name中插入多条记录  
+    向表tb_name中插入多条记录。  
    **注意**：在使用“插入多条记录”方式写入数据时，不能把第一列的时间戳取值都设为now，否则会导致语句中的多条记录使用相同的时间戳，于是就可能出现相互覆盖以致这些数据行无法全部被正确保存。
 - **按指定的列插入多条记录**
    ```mysql
    INSERT INTO tb_name (field1_name, ...) VALUES (field1_value1, ...) (field1_value2, ...) ...;
    ```
-    向表tb_name中按指定的列插入多条记录
+    向表tb_name中按指定的列插入多条记录。
 - **向多个表插入多条记录**
    ```mysql
    INSERT INTO tb1_name VALUES (field1_value1, ...) (field1_value2, ...) ...
                tb2_name VALUES (field1_value1, ...) (field1_value2, ...) ...;
    ```
-    同时向表tb1_name和tb2_name中分别插入多条记录
+    同时向表tb1_name和tb2_name中分别插入多条记录。
 - **同时向多个表按列插入多条记录**
    ```mysql
    INSERT INTO tb1_name (tb1_field1_name, ...) VALUES (field1_value1, ...) (field1_value2, ...) ...
                tb2_name (tb2_field1_name, ...) VALUES (field1_value1, ...) (field1_value2, ...) ...;
    ```
-    同时向表tb1_name和tb2_name中按列分别插入多条记录 
+    同时向表tb1_name和tb2_name中按列分别插入多条记录。  
-    注意：允许插入的最老记录的时间戳，是相对于当前服务器时间，减去配置的keep值（数据保留的天数），允许插入的最新记录的时间戳，是相对于当前服务器时间，加上配置的days值（数据文件存储数据的时间跨度，单位为天）。keep和days都是可以在创建数据库时指定的，缺省值分别是3650天和10天。
+    注意：  
+    1) 如果时间戳为now，系统将自动使用客户端当前时间作为该记录的时间戳；  
+    2) 允许插入的最老记录的时间戳，是相对于当前服务器时间，减去配置的keep值（数据保留的天数），允许插入的最新记录的时间戳，是相对于当前服务器时间，加上配置的days值（数据文件存储数据的时间跨度，单位为天）。keep和days都是可以在创建数据库时指定的，缺省值分别是3650天和10天。
 - <a class="anchor" id="auto_create_table"></a>**插入记录时自动建表**
    ```mysql
    INSERT INTO tb_name USING stb_name TAGS (tag_value1, ...) VALUES (field_value1, ...);
    ```
-    如果用户在写数据时并不确定某个表是否存在，此时可以在写入数据时使用自动建表语法来创建不存在的表，若该表已存在则不会建立新表。自动建表时，要求必须以超级表为模板，并写明数据表的 tags 取值。
+    如果用户在写数据时并不确定某个表是否存在，此时可以在写入数据时使用自动建表语法来创建不存在的表，若该表已存在则不会建立新表。自动建表时，要求必须以超级表为模板，并写明数据表的 TAGS 取值。
- **插入记录时自动建表，并指定具体的 tags 列**
+- **插入记录时自动建表，并指定具体的 TAGS 列**
    ```mysql
    INSERT INTO tb_name USING stb_name (tag_name1, ...) TAGS (tag_value1, ...) VALUES (field_value1, ...);
    ```
-    在自动建表时，可以只是指定部分 tags 列的取值，未被指定的 tags 列将取为空值。
+    在自动建表时，可以只是指定部分 TAGS 列的取值，未被指定的 TAGS 列将取为空值。
+- **同时向多个表按列插入多条记录，自动建表**
+    ```mysql
+    INSERT INTO tb1_name (tb1_field1_name, ...) [USING stb1_name TAGS (tag_value1, ...)] VALUES (field1_value1, ...) (field1_value2, ...) ...
+                tb2_name (tb2_field1_name, ...) [USING stb2_name TAGS (tag_value2, ...)] VALUES (field1_value1, ...) (field1_value2, ...) ...;
+    ```
+    以自动建表的方式，同时向表tb1_name和tb2_name中按列分别插入多条记录。
 **历史记录写入**：可使用IMPORT或者INSERT命令，IMPORT的语法，功能与INSERT完全一样。
@@ -471,7 +482,7 @@ Query OK, 9 row(s) in set (0.002022s)
 SELECT * FROM d1001;
 SELECT d1001.* FROM d1001;
 ```
-在Join查询中，带前缀的\*和不带前缀\*返回的结果有差别， \*返回全部表的所有列数据（不包含标签），带前缀的通配符，则只返回该表的列数据。
+在JOIN查询中，带前缀的\*和不带前缀\*返回的结果有差别， \*返回全部表的所有列数据（不包含标签），带前缀的通配符，则只返回该表的列数据。
 ```mysql
 taos> SELECT * FROM d1001, d1003 WHERE d1001.ts=d1003.ts;
           ts            | current |   voltage   |    phase     |           ts            | current |   voltage   |    phase     |
@@ -487,7 +498,7 @@ taos> SELECT d1001.* FROM d1001,d1003 WHERE d1001.ts = d1003.ts;
 Query OK, 1 row(s) in set (0.020443s)
 ```
-在使用SQL函数来进行查询过程中，部分SQL函数支持通配符操作。其中的区别在于：
+在使用SQL函数来进行查询的过程中，部分SQL函数支持通配符操作。其中的区别在于：
 ```count(*)```函数只返回一列。```first```、```last```、```last_row```函数则是返回全部列。
 ```mysql
@@ -522,12 +533,12 @@ Query OK, 2 row(s) in set (0.003112s)
 ##### 获取标签列的去重取值
-从 2.0.15 版本开始，支持在超级表查询标签列时，指定 distinct 关键字，这样将返回指定标签列的所有不重复取值。
+从 2.0.15 版本开始，支持在超级表查询标签列时，指定 DISTINCT 关键字，这样将返回指定标签列的所有不重复取值。
 ```mysql
 SELECT DISTINCT tag_name FROM stb_name;
 ```
-注意：目前 distinct 关键字只支持对超级表的标签列进行去重，而不能用于普通列。
+注意：目前 DISTINCT 关键字只支持对超级表的标签列进行去重，而不能用于普通列。
@@ -562,7 +573,7 @@ SELECT * FROM d1001;
 #### 特殊功能
-部分特殊的查询功能可以不使用FROM子句执行。获取当前所在的数据库 database() 
+部分特殊的查询功能可以不使用FROM子句执行。获取当前所在的数据库 database()： 
 ```mysql
 taos> SELECT DATABASE();
           database()           |
@@ -570,7 +581,7 @@ taos> SELECT DATABASE();
 power                          |
 Query OK, 1 row(s) in set (0.000079s)
 ```
-如果登录的时候没有指定默认数据库，且没有使用```use```命令切换数据，则返回NULL。
+如果登录的时候没有指定默认数据库，且没有使用```USE```命令切换数据，则返回NULL。
 ```mysql
 taos> SELECT DATABASE();
           database()           |
@@ -578,7 +589,7 @@ taos> SELECT DATABASE();
 NULL                           |
 Query OK, 1 row(s) in set (0.000184s)
 ```
-获取服务器和客户端版本号:
+获取服务器和客户端版本号：
 ```mysql
 taos> SELECT CLIENT_VERSION();
 client_version() |
@@ -622,7 +633,7 @@ SELECT TBNAME, location FROM meters;
 ```mysql
 SELECT COUNT(TBNAME) FROM meters;
 ```
-以上两个查询均只支持在Where条件子句中添加针对标签（TAGS）的过滤条件。例如：
+以上两个查询均只支持在WHERE条件子句中添加针对标签（TAGS）的过滤条件。例如：
 ```mysql
 taos> SELECT TBNAME, location FROM meters;
             tbname             |            location            |
@@ -648,30 +659,31 @@ Query OK, 1 row(s) in set (0.001091s)
 - 参数 LIMIT 控制输出条数，OFFSET 指定从第几条开始输出。LIMIT/OFFSET 对结果集的执行顺序在 ORDER BY 之后。
  * 在有 GROUP BY 子句的情况下，LIMIT 参数控制的是每个分组中至多允许输出的条数。
 - 参数 SLIMIT 控制由 GROUP BY 指令划分的分组中，至多允许输出几个分组的数据。
- 通过 ">>" 输出结果可以导出到指定文件。
+- 通过 “>>” 输出结果可以导出到指定文件。
 ### 支持的条件过滤操作
-| Operation   | Note                          | Applicable Data Types                 |
+| **Operation**   | **Note**                      | **Applicable Data Types**             |
-| ----------- | ----------------------------- | ------------------------------------- |
+| --------------- | ----------------------------- | ------------------------------------- |
-| >           | larger than                   | **`timestamp`** and all numeric types |
+| >               | larger than                   | **`timestamp`** and all numeric types |
-| <           | smaller than                  | **`timestamp`** and all numeric types |
+| <               | smaller than                  | **`timestamp`** and all numeric types |
-| >=          | larger than or equal to       | **`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 |
+| <=              | smaller than or equal to      | **`timestamp`** and all numeric types |
-| =           | equal to                      | all types                             |
+| =               | equal to                      | all types                             |
-| <>          | not equal to                  | all types                             |
+| <>              | not equal to                  | all types                             |
-| between and | within a certain range        | **`timestamp`** and all numeric types |
+| between and     | within a certain range        | **`timestamp`** and all numeric types |
-| %           | match with any char sequences | **`binary`** **`nchar`**              |
+| %               | match with any char sequences | **`binary`** **`nchar`**              |
-| _           | match with a single char      | **`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”。
 <!-- 
-### <a class="anchor" id="having"></a>GROUP BY 之后的 HAVING 过滤
+<a class="anchor" id="having"></a>
+### GROUP BY 之后的 HAVING 过滤
-从 2.0.20 版本开始，GROUP BY 之后允许再跟一个 HAVING 子句，对成组后的各组数据再做筛选。HAVING 子句可以使用聚合函数和选择函数作为过滤条件（但暂时不支持 LEASTSQUARES、TOP、BOTTOM、LAST_ROW）。
+从 2.0.20.0 版本开始，GROUP BY 之后允许再跟一个 HAVING 子句，对成组后的各组数据再做筛选。HAVING 子句可以使用聚合函数和选择函数作为过滤条件（但暂时不支持 LEASTSQUARES、TOP、BOTTOM、LAST_ROW）。
 例如，如下语句只会输出 `AVG(f1) > 0` 的分组：
 ```mysql
@@ -679,7 +691,8 @@ SELECT AVG(f1), SPREAD(f1, f2, st2.f1) FROM st2 WHERE f1 > 0 GROUP BY f1 HAVING
 ```
 -->
-### <a class="anchor" id="union"></a>UNION ALL 操作符
+<a class="anchor" id="union"></a>
+### UNION ALL 操作符
 ```mysql
 SELECT ...
@@ -691,37 +704,38 @@ TDengine 支持 UNION ALL 操作符。也就是说，如果多个 SELECT 子句
 ### SQL 示例 
- 对于下面的例子，表tb1用以下语句创建
+- 对于下面的例子，表tb1用以下语句创建：
    ```mysql
    CREATE TABLE tb1 (ts TIMESTAMP, col1 INT, col2 FLOAT, col3 BINARY(50));
    ```
- 查询tb1刚过去的一个小时的所有记录
+- 查询tb1刚过去的一个小时的所有记录：
    ```mysql
    SELECT * FROM tb1 WHERE ts >= NOW - 1h;
    ```
- 查询表tb1从2018-06-01 08:00:00.000 到2018-06-02 08:00:00.000时间范围，并且col3的字符串是'nny'结尾的记录，结果按照时间戳降序
+- 查询表tb1从2018-06-01 08:00:00.000 到2018-06-02 08:00:00.000时间范围，并且col3的字符串是'nny'结尾的记录，结果按照时间戳降序：
    ```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;
    ```
- 查询col1与col2的和，并取名complex, 时间大于2018-06-01 08:00:00.000, col2大于1.2，结果输出仅仅10条记录，从第5条开始
+- 查询col1与col2的和，并取名complex, 时间大于2018-06-01 08:00:00.000, col2大于1.2，结果输出仅仅10条记录，从第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;
    ```
- 查询过去10分钟的记录，col2的值大于3.14，并且将结果输出到文件 `/home/testoutpu.csv`.
+- 查询过去10分钟的记录，col2的值大于3.14，并且将结果输出到文件 `/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 函数
+<a class="anchor" id="functions"></a>
+## SQL 函数
 ### 聚合函数
@@ -741,7 +755,7 @@ TDengine支持针对数据的聚合查询。提供支持的聚合和选择函数
    说明：
-    1）可以使用星号\*来替代具体的字段，使用星号(\*)返回全部记录数量。
+    1）可以使用星号(\*)来替代具体的字段，使用星号(\*)返回全部记录数量。
    2）针对同一表的（不包含NULL值）字段查询结果均相同。
@@ -1012,7 +1026,9 @@ TDengine支持针对数据的聚合查询。提供支持的聚合和选择函数
    1）*k*值取值范围1≤*k*≤100；
-    2）系统同时返回该记录关联的时间戳列。
+    2）系统同时返回该记录关联的时间戳列；
+    3）限制：TOP函数不支持FILL子句。
    示例：
    ```mysql
@@ -1048,7 +1064,9 @@ TDengine支持针对数据的聚合查询。提供支持的聚合和选择函数
    1）*k*值取值范围1≤*k*≤100；
-    2）系统同时返回该记录关联的时间戳列。
+    2）系统同时返回该记录关联的时间戳列；
+    3）限制：BOTTOM函数不支持FILL子句。
    示例：
    ```mysql
@@ -1124,7 +1142,9 @@ TDengine支持针对数据的聚合查询。提供支持的聚合和选择函数
    适用于：**表、超级表**。
-    说明：与last函数不同，last_row不支持时间范围限制，强制返回最后一条记录。
+    说明：与LAST函数不同，LAST_ROW不支持时间范围限制，强制返回最后一条记录。
+    限制：LAST_ROW()不能与INTERVAL一起使用。
    示例：
    ```mysql
@@ -1233,40 +1253,40 @@ SELECT function_list FROM tb_name
  [WHERE where_condition]
  INTERVAL (interval [, offset])
  [SLIDING sliding]
-  [FILL ({NONE | VALUE | PREV | NULL | LINEAR})]
+  [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})]
+  [FILL ({ VALUE | PREV | NULL | LINEAR | NEXT})]
  [GROUP BY tags]
 ```
 - 聚合时间段的长度由关键词INTERVAL指定，最短时间间隔10毫秒（10a），并且支持偏移（偏移必须小于间隔）。聚合查询中，能够同时执行的聚合和选择函数仅限于单个输出的函数：count、avg、sum 、stddev、leastsquares、percentile、min、max、first、last，不能使用具有多行输出结果的函数（例如：top、bottom、diff以及四则运算）。
- WHERE语句可以指定查询的起止时间和其他过滤条件
+- WHERE语句可以指定查询的起止时间和其他过滤条件。
- SLIDING语句用于指定聚合时间段的前向增量
+- SLIDING语句用于指定聚合时间段的前向增量。
 - FILL语句指定某一时间区间数据缺失的情况下的填充模式。填充模式包括以下几种：
-  * 不进行填充：NONE(默认填充模式)。
+  1. 不进行填充：NONE(默认填充模式)。
-  * VALUE填充：固定值填充，此时需要指定填充的数值。例如：fill(value, 1.23)。
+  2. VALUE填充：固定值填充，此时需要指定填充的数值。例如：FILL(VALUE, 1.23)。
-  * NULL填充：使用NULL填充数据。例如：fill(null)。
+  3. NULL填充：使用NULL填充数据。例如：FILL(NULL)。
-  * PREV填充：使用前一个非NULL值填充数据。例如：fill(prev)。
+  4. PREV填充：使用前一个非NULL值填充数据。例如：FILL(PREV)。
+  5. NEXT填充：使用下一个非NULL值填充数据。例如：FILL(NEXT)。
 说明：
  1. 使用FILL语句的时候可能生成大量的填充输出，务必指定查询的时间区间。针对每次查询，系统可返回不超过1千万条具有插值的结果。
  2. 在时间维度聚合中，返回的结果中时间序列严格单调递增。
-  3. 如果查询对象是超级表，则聚合函数会作用于该超级表下满足值过滤条件的所有表的数据。如果查询中没有使用group by语句，则返回的结果按照时间序列严格单调递增；如果查询中使用了group by语句分组，则返回结果中每个group内不按照时间序列严格单调递增。
+  3. 如果查询对象是超级表，则聚合函数会作用于该超级表下满足值过滤条件的所有表的数据。如果查询中没有使用GROUP BY语句，则返回的结果按照时间序列严格单调递增；如果查询中使用了GROUP BY语句分组，则返回结果中每个GROUP内不按照时间序列严格单调递增。
 时间聚合也常被用于连续查询场景，可以参考文档 [连续查询(Continuous Query)](https://www.taosdata.com/cn/documentation/advanced-features#continuous-query)。
-**示例:** 智能电表的建表语句如下：
+**示例**： 智能电表的建表语句如下：
 ```mysql
 CREATE TABLE meters (ts TIMESTAMP, current FLOAT, voltage INT, phase FLOAT) TAGS (location BINARY(64), groupId INT);
 ```
-针对智能电表采集的数据，以10分钟为一个阶段，计算过去24小时的电流数据的平均值、最大值、电流的中位数、以及随着时间变化的电流走势拟合直线。如果没有计算值，用前一个非NULL值填充。
+针对智能电表采集的数据，以10分钟为一个阶段，计算过去24小时的电流数据的平均值、最大值、电流的中位数、以及随着时间变化的电流走势拟合直线。如果没有计算值，用前一个非NULL值填充。使用的查询语句如下：
-使用的查询语句如下：
 ```mysql
 SELECT AVG(current), MAX(current), LEASTSQUARES(current, start_val, step_val), PERCENTILE(current, 50) FROM meters
@@ -1287,15 +1307,15 @@ SELECT AVG(current), MAX(current), LEASTSQUARES(current, start_val, step_val), P
 ##  TAOS SQL其他约定
-**group by的限制**
+**GROUP BY的限制**
-TAOS  SQL支持对标签、tbname进行group by操作，也支持普通列进行group by，前提是：仅限一列且该列的唯一值小于10万个。
+TAOS  SQL支持对标签、TBNAME进行GROUP BY操作，也支持普通列进行GROUP BY，前提是：仅限一列且该列的唯一值小于10万个。
-**join操作的限制**
+**JOIN操作的限制**
 TAOS SQL支持表之间按主键时间戳来join两张表的列，暂不支持两个表之间聚合后的四则运算。
-**is not null与不为空的表达式适用范围**
+**IS NOT NULL与不为空的表达式适用范围**
-is not null支持所有类型的列。不为空的表达式为 <>""，仅对非数值类型的列适用。
+IS NOT NULL支持所有类型的列。不为空的表达式为 <>""，仅对非数值类型的列适用。
--- a/documentation20/cn/13.faq/docs.md
+++ b/documentation20/cn/13.faq/docs.md
@@ -26,17 +26,17 @@
 ## 2. Windows平台下JDBCDriver找不到动态链接库，怎么办？
-请看为此问题撰写的[技术博客](https://www.taosdata.com/blog/2019/12/03/jdbcdriver找不到动态链接库/)
+请看为此问题撰写的[技术博客](https://www.taosdata.com/blog/2019/12/03/950.html)
 ## 3. 创建数据表时提示more dnodes are needed
-请看为此问题撰写的[技术博客](https://www.taosdata.com/blog/2019/12/03/创建数据表时提示more-dnodes-are-needed/)
+请看为此问题撰写的[技术博客](https://www.taosdata.com/blog/2019/12/03/965.html)
 ## 4. 如何让TDengine crash时生成core文件？
-请看为此问题撰写的[技术博客](https://www.taosdata.com/blog/2019/12/06/tdengine-crash时生成core文件的方法/)
+请看为此问题撰写的[技术博客](https://www.taosdata.com/blog/2019/12/06/974.html)
-## 5. 遇到错误"Unable to establish connection", 我怎么办？
+## 5. 遇到错误“Unable to establish connection”, 我怎么办？
 客户端遇到连接故障，请按照下面的步骤进行检查：
@@ -51,13 +51,13 @@
 4. 确认客户端连接时指定了正确的服务器FQDN (Fully Qualified Domain Name(可在服务器上执行Linux命令hostname -f获得)）,FQDN配置参考：[一篇文章说清楚TDengine的FQDN](https://www.taosdata.com/blog/2020/09/11/1824.html)。
-5. ping服务器FQDN，如果没有反应，请检查你的网络，DNS设置，或客户端所在计算机的系统hosts文件
+5. ping服务器FQDN，如果没有反应，请检查你的网络，DNS设置，或客户端所在计算机的系统hosts文件。如果部署的是TDengine集群，客户端需要能ping通所有集群节点的FQDN。
 6. 检查防火墙设置（Ubuntu 使用 ufw status，CentOS 使用 firewall-cmd --list-port），确认TCP/UDP 端口6030-6042 是打开的
 7. 对于Linux上的JDBC（ODBC, Python, Go等接口类似）连接, 确保*libtaos.so*在目录*/usr/local/taos/driver*里, 并且*/usr/local/taos/driver*在系统库函数搜索路径*LD_LIBRARY_PATH*里
-8. 对于windows上的JDBC, ODBC, Python, Go等连接，确保*C:\TDengine\driver\taos.dll*在你的系统库函数搜索目录里 (建议*taos.dll*放在目录 *C:\Windows\System32*)
+8. 对于Windows上的JDBC, ODBC, Python, Go等连接，确保*C:\TDengine\driver\taos.dll*在你的系统库函数搜索目录里 (建议*taos.dll*放在目录 *C:\Windows\System32*)
 9. 如果仍不能排除连接故障
@@ -70,7 +70,8 @@
 10. 也可以使用taos程序内嵌的网络连通检测功能，来验证服务器和客户端之间指定的端口连接是否通畅（包括TCP和UDP）：[TDengine 内嵌网络检测工具使用指南](https://www.taosdata.com/blog/2020/09/08/1816.html)。
-## 6. 遇到错误“Unexpected generic error in RPC”或者"TDengine Error: Unable to resolve FQDN"， 我怎么办？
+## 6. 遇到错误“Unexpected generic error in RPC”或者“Unable to resolve FQDN”，我怎么办？
 产生这个错误，是由于客户端或数据节点无法解析FQDN(Fully Qualified Domain Name)导致。对于TAOS Shell或客户端应用，请做如下检查：
 1. 请检查连接的服务器的FQDN是否正确,FQDN配置参考：[一篇文章说清楚TDengine的FQDN](https://www.taosdata.com/blog/2020/09/11/1824.html)。
@@ -102,7 +103,7 @@ TDengine 目前尚不支持删除功能，未来根据用户需求可能会支
 批量插入。每条写入语句可以一张表同时插入多条记录，也可以同时插入多张表的多条记录。
-## 12. windows系统下插入的nchar类数据中的汉字被解析成了乱码如何解决？
+## 12. Windows系统下插入的nchar类数据中的汉字被解析成了乱码如何解决？
 Windows下插入nchar类的数据中如果有中文，请先确认系统的地区设置成了中国（在Control Panel里可以设置），这时cmd中的`taos`客户端应该已经可以正常工作了；如果是在IDE里开发Java应用，比如Eclipse， Intellij，请确认IDE里的文件编码为GBK（这是Java默认的编码类型），然后在生成Connection时，初始化客户端的配置，具体语句如下：
 ```JAVA
@@ -115,15 +116,15 @@ Connection = DriverManager.getConnection(url, properties);
 ## 13.JDBC报错： the excuted SQL is not a DML or a DDL？
 请更新至最新的JDBC驱动
-```JAVA
+```xml
 <dependency>
  <groupId>com.taosdata.jdbc</groupId>
  <artifactId>taos-jdbcdriver</artifactId>
-  <version>2.0.4</version>
+  <version>2.0.27</version>
 </dependency>
 ```
-## 14. taos connect failed, reason: invalid timestamp
+## 14. taos connect failed, reason&#58; invalid timestamp
 常见原因是服务器和客户端时间没有校准，可以通过和时间服务器同步的方式（Linux 下使用 ntpdate 命令，Windows 在系统时间设置中选择自动同步）校准。
@@ -157,7 +158,8 @@ ALTER LOCAL RESETLOG;
 其含义是，清空本机所有由客户端生成的日志文件。
-## <a class="anchor" id="timezone"></a>18. 时间戳的时区信息是怎样处理的？
+<a class="anchor" id="timezone"></a>
+## 18. 时间戳的时区信息是怎样处理的？
 TDengine 中时间戳的时区总是由客户端进行处理，而与服务端无关。具体来说，客户端会对 SQL 语句中的时间戳进行时区转换，转为 UTC 时区（即 Unix 时间戳——Unix Timestamp）再交由服务端进行写入和查询；在读取数据时，服务端也是采用 UTC 时区提供原始数据，客户端收到后再根据本地设置，把时间戳转换为本地系统所要求的时区进行显示。
@@ -167,12 +169,13 @@ TDengine 中时间戳的时区总是由客户端进行处理，而与服务端
 3. 如果在 C/C++/Java/Python 等各种编程语言的 Connector Driver 中，在建立数据库连接时显式指定了 timezone，那么会以这个指定的时区设置为准。例如 Java Connector 的 JDBC URL 中就有 timezone 参数。
 4. 在书写 SQL 语句时，也可以直接使用 Unix 时间戳（例如 `1554984068000`）或带有时区的时间戳字符串，也即以 RFC 3339 格式（例如 `2013-04-12T15:52:01.123+08:00`）或 ISO-8601 格式（例如 `2013-04-12T15:52:01.123+0800`）来书写时间戳，此时这些时间戳的取值将不再受其他时区设置的影响。
-## <a class="anchor" id="port"></a>19. TDengine 都会用到哪些网络端口？
+<a class="anchor" id="port"></a>
+## 19. TDengine 都会用到哪些网络端口？
 在 TDengine 2.0 版本中，会用到以下这些网络端口（以默认端口 6030 为前提进行说明，如果修改了配置文件中的设置，那么这里列举的端口都会出现变化），管理员可以参考这里的信息调整防火墙设置：
 | 协议 | 默认端口   | 用途说明                         | 修改方法                        |
-| --- | --------- | ------------------------------- | ------------------------------ |
+| :--- | :-------- | :---------------------------------- | :------------------------------- |
 | TCP | 6030      | 客户端与服务端之间通讯。            | 由配置文件设置 serverPort 决定。 |
 | TCP | 6035      | 多节点集群的节点间通讯。            | 随 serverPort 端口变化。        |
 | TCP | 6040      | 多节点集群的节点间数据同步。        | 随 serverPort 端口变化。         |

--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
@@ -114,6 +114,25 @@ mkdir -p ${install_dir}/examples
 examples_dir="${top_dir}/tests/examples"
  cp -r ${examples_dir}/c      ${install_dir}/examples
 if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
+  if [ -d ${examples_dir}/JDBC/connectionPools/target ]; then
+    rm -rf ${examples_dir}/JDBC/connectionPools/target
+  fi
+  if [ -d ${examples_dir}/JDBC/JDBCDemo/target ]; then
+    rm -rf ${examples_dir}/JDBC/JDBCDemo/target
+  fi
+  if [ -d ${examples_dir}/JDBC/mybatisplus-demo/target ]; then
+    rm -rf ${examples_dir}/JDBC/mybatisplus-demo/target
+  fi
+  if [ -d ${examples_dir}/JDBC/springbootdemo/target ]; then
+    rm -rf ${examples_dir}/JDBC/springbootdemo/target
+  fi
+  if [ -d ${examples_dir}/JDBC/SpringJdbcTemplate/target ]; then
+    rm -rf ${examples_dir}/JDBC/SpringJdbcTemplate/target
+  fi
+  if [ -d ${examples_dir}/JDBC/taosdemo/target ]; then
+    rm -rf ${examples_dir}/JDBC/taosdemo/target
+  fi
  cp -r ${examples_dir}/JDBC   ${install_dir}/examples
  cp -r ${examples_dir}/matlab ${install_dir}/examples
  cp -r ${examples_dir}/python ${install_dir}/examples

--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
 name: tdengine
 base: core18
+version: '2.1.1.0'
-version: '2.1.0.0'
 icon: snap/gui/t-dengine.svg
 summary: an open-source big data platform designed and optimized for IoT. 
 description: |
@@ -73,7 +72,7 @@ parts:
      - usr/bin/taosd
      - usr/bin/taos
      - usr/bin/taosdemo
-      - usr/lib/libtaos.so.2.1.0.0
+      - usr/lib/libtaos.so.2.1.1.0
      - usr/lib/libtaos.so.1
      - usr/lib/libtaos.so

--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -7187,6 +7187,11 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, int32_t index) {
  const char* msg1 = "point interpolation query needs timestamp";
  const char* msg2 = "too many tables in from clause";
  const char* msg3 = "start(end) time of query range required or time range too large";
+  // const char* msg5 = "too many columns in selection clause";
+  // const char* msg6 = "too many tables in from clause";
+  // const char* msg7 = "invalid table alias name";
+  // const char* msg8 = "alias name too long";
+  const char* msg9 = "only tag query not compatible with normal column filter";
  int32_t code = TSDB_CODE_SUCCESS;
@@ -7326,6 +7331,20 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, int32_t index) {
      }
    }
+    if (tscQueryTags(pQueryInfo)) {
+      SExprInfo* pExpr1 = tscSqlExprGet(pQueryInfo, 0);
+      if (pExpr1->base.functionId != TSDB_FUNC_TID_TAG) {
+        int32_t numOfCols = (int32_t)taosArrayGetSize(pQueryInfo->colList);
+        for (int32_t i = 0; i < numOfCols; ++i) {
+          SColumn* pCols = taosArrayGetP(pQueryInfo->colList, i);
+          if (pCols->info.flist.numOfFilters > 0) {
+            return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg9);
+          }
+        }
+      }
+    }
    // parse the having clause in the first place
    if (validateHavingClause(pQueryInfo, pSqlNode->pHaving, pCmd, pSqlNode->pSelNodeList, joinQuery, timeWindowQuery) !=
        TSDB_CODE_SUCCESS) {

--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -1928,8 +1928,9 @@ int tscProcessTableMetaRsp(SSqlObj *pSql) {
    }
  }
-  tscDebug("0x%"PRIx64" recv table meta, uid:%" PRIu64 ", tid:%d, name:%s", pSql->self, pTableMeta->id.uid, pTableMeta->id.tid,
+  tscDebug("0x%"PRIx64" recv table meta, uid:%" PRIu64 ", tid:%d, name:%s, numOfCols:%d, numOfTags:%d", pSql->self,
-           tNameGetTableName(&pTableMetaInfo->name));
+      pTableMeta->id.uid, pTableMeta->id.tid, tNameGetTableName(&pTableMetaInfo->name), pTableMeta->tableInfo.numOfColumns,
+      pTableMeta->tableInfo.numOfTags);
  free(pTableMeta);
  return TSDB_CODE_SUCCESS;
@@ -2072,7 +2073,7 @@ int tscProcessSTableVgroupRsp(SSqlObj *pSql) {
    pInfo->vgroupList->numOfVgroups = pVgroupMsg->numOfVgroups;
    if (pInfo->vgroupList->numOfVgroups <= 0) {
-      tscDebug("0x%"PRIx64" empty vgroup info, no corresponding tables for stable", pSql->self);
+      tscDebug("0x%" PRIx64 " empty vgroup info, no corresponding tables for stable", pSql->self);
    } else {
      for (int32_t j = 0; j < pInfo->vgroupList->numOfVgroups; ++j) {
        // just init, no need to lock

--- a/src/client/src/tscStream.c
+++ b/src/client/src/tscStream.c
@@ -627,6 +627,7 @@ TAOS_STREAM *taos_open_stream(TAOS *taos, const char *sqlstr, void (*fp)(void *p
  if (pSql->sqlstr == NULL) {
    tscError("0x%"PRIx64" failed to malloc sql string buffer", pSql->self);
    tscFreeSqlObj(pSql);
+    free(pStream);
    return NULL;
  }

--- a/src/client/src/tscSub.c
+++ b/src/client/src/tscSub.c
@@ -215,7 +215,7 @@ static void tscProcessSubscriptionTimer(void *handle, void *tmrId) {
  taosTmrReset(tscProcessSubscriptionTimer, pSub->interval, pSub, tscTmr, &pSub->pTimer);
 }
+//TODO refactor: extract table list name not simply from the sql
 static SArray* getTableList( SSqlObj* pSql ) {
  const char* p = strstr( pSql->sqlstr, " from " );
  assert(p != NULL); // we are sure this is a 'select' statement
@@ -224,11 +224,11 @@ static SArray* getTableList( SSqlObj* pSql ) {
  SSqlObj* pNew = taos_query(pSql->pTscObj, sql);
  if (pNew == NULL) {
-    tscError("0x%"PRIx64"failed to retrieve table id: cannot create new sql object.", pSql->self);
+    tscError("0x%"PRIx64" failed to retrieve table id: cannot create new sql object.", pSql->self);
    return NULL;
  } else if (taos_errno(pNew) != TSDB_CODE_SUCCESS) {
-    tscError("0x%"PRIx64"failed to retrieve table id,error: %s", pSql->self, tstrerror(taos_errno(pNew)));
+    tscError("0x%"PRIx64" failed to retrieve table id,error: %s", pSql->self, tstrerror(taos_errno(pNew)));
    return NULL;
  }

--- a/go @ 8ce6d865
+++ b/go @ 8ce6d865
-Subproject commit 7a26c432f8b4203e42344ff3290b9b9b01b983d5
+Subproject commit 8ce6d86558afc8c0b50c10f990fd2b4270cf06fc
--- a/grafanaplugin @ 3530c6df
+++ b/grafanaplugin @ 3530c6df
-Subproject commit 32e2c97a4cf7bedaa99f5d6dd8cb036e7f4470df
+Subproject commit 3530c6df097134a410bacec6b3cd013ef38a61aa
--- a/src/connector/odbc/examples/c/main.c
+++ b/src/connector/odbc/examples/c/main.c
@@ -312,11 +312,7 @@ static int test_sqls_in_stmt(SQLHENV env, SQLHDBC conn, SQLHSTMT stmt, const cha
    size_t len = 0;
    ssize_t n = 0;
-#ifdef _MSC_VER
+    n = tgetline(&line, &len, f);
-    n = taosGetlineImp(&line, &len, f);
-#else
-    n = getline(&line, &len, f);
-#endif
    if (n==-1) break;
    const char *p = NULL;

--- a/src/inc/taoserror.h
+++ b/src/inc/taoserror.h
@@ -219,6 +219,7 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_VND_NO_WRITE_AUTH             TAOS_DEF_ERROR_CODE(0, 0x0512)  //"Database write operation denied")
 #define TSDB_CODE_VND_IS_SYNCING                TAOS_DEF_ERROR_CODE(0, 0x0513)  //"Database is syncing")
 #define TSDB_CODE_VND_INVALID_TSDB_STATE        TAOS_DEF_ERROR_CODE(0, 0x0514)  //"Invalid tsdb state")
+#define TSDB_CODE_VND_IS_CLOSING                TAOS_DEF_ERROR_CODE(0, 0x0515)  //"Database is closing")
 // tsdb
 #define TSDB_CODE_TDB_INVALID_TABLE_ID          TAOS_DEF_ERROR_CODE(0, 0x0600)  //"Invalid table ID")

--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -19,6 +19,7 @@
 */
 #include <stdint.h>
+#include <taos.h>
 #define _GNU_SOURCE
 #define CURL_STATICLIB
@@ -229,13 +230,13 @@ typedef struct SArguments_S {
  uint32_t num_of_threads;
  uint64_t insert_interval;
  int64_t  query_times;
-  uint64_t interlace_rows;
+  uint32_t interlace_rows;
-  uint64_t num_of_RPR;                  // num_of_records_per_req
+  uint32_t num_of_RPR;                  // num_of_records_per_req
  uint64_t max_sql_len;
  int64_t  num_of_tables;
  int64_t  num_of_DPT;
  int      abort;
-  int      disorderRatio;               // 0: no disorder, >0: x%
+  uint32_t disorderRatio;               // 0: no disorder, >0: x%
  int      disorderRange;               // ms or us by database precision
  uint32_t method_of_delete;
  char **  arg_list;
@@ -258,12 +259,12 @@ typedef struct SSuperTable_S {
  uint8_t      autoCreateTable;         // 0: create sub table, 1: auto create sub table
  char         childTblPrefix[MAX_TB_NAME_SIZE];
  char         dataSource[MAX_TB_NAME_SIZE+1];  // rand_gen or sample
-  uint16_t     insertMode;              // 0: taosc, 1: rest, 2: stmt
+  uint16_t     iface;                   // 0: taosc, 1: rest, 2: stmt
  int64_t      childTblLimit;
  uint64_t     childTblOffset;
 //  int          multiThreadWriteOneTbl;  // 0: no, 1: yes
-  uint64_t     interlaceRows;           //
+  uint32_t     interlaceRows;           //
  int          disorderRatio;           // 0: no disorder, >0: x%
  int          disorderRange;           // ms or us by database precision
  uint64_t     maxSqlLen;               //
@@ -375,7 +376,7 @@ typedef struct SDbs_S {
 typedef struct SpecifiedQueryInfo_S {
  uint64_t     queryInterval;  // 0: unlimit  > 0   loop/s
-  uint64_t     concurrent;
+  uint32_t     concurrent;
  uint64_t     sqlCount;
  uint32_t     asyncMode; // 0: sync, 1: async
  uint64_t     subscribeInterval; // ms
@@ -386,6 +387,9 @@ typedef struct SpecifiedQueryInfo_S {
  char         result[MAX_QUERY_SQL_COUNT][MAX_FILE_NAME_LEN+1];
  int          resubAfterConsume[MAX_QUERY_SQL_COUNT];
  TAOS_SUB*    tsub[MAX_QUERY_SQL_COUNT];
+  char         topic[MAX_QUERY_SQL_COUNT][32];
+  int          consumed[MAX_QUERY_SQL_COUNT];
+  TAOS_RES*    res[MAX_QUERY_SQL_COUNT];
  uint64_t     totalQueried;
 } SpecifiedQueryInfo;
@@ -403,7 +407,7 @@ typedef struct SuperQueryInfo_S {
  uint64_t     sqlCount;
  char         sql[MAX_QUERY_SQL_COUNT][MAX_QUERY_SQL_LENGTH+1];
  char         result[MAX_QUERY_SQL_COUNT][MAX_FILE_NAME_LEN+1];
-  int          resubAfterConsume[MAX_QUERY_SQL_COUNT];
+  int          resubAfterConsume;
  TAOS_SUB*    tsub[MAX_QUERY_SQL_COUNT];
  char*        childTblName;
@@ -431,7 +435,8 @@ typedef struct SThreadInfo_S {
  int       threadID;
  char      db_name[MAX_DB_NAME_SIZE+1];
  uint32_t  time_precision;
-  char      fp[4096];
+  char      filePath[4096];
+  FILE      *fp;
  char      tb_prefix[MAX_TB_NAME_SIZE];
  uint64_t  start_table_from;
  uint64_t  end_table_to;
@@ -465,6 +470,7 @@ typedef struct SThreadInfo_S {
  // seq of query or subscribe
  uint64_t  querySeq;   // sequence number of sql command
+  TAOS_SUB*  tsub;
 } threadInfo;
@@ -546,7 +552,9 @@ static int createDatabasesAndStables();
 static void createChildTables();
 static int queryDbExec(TAOS *taos, char *command, QUERY_TYPE type, bool quiet);
 static int postProceSql(char *host, struct sockaddr_in *pServAddr,
-        uint16_t port, char* sqlstr, char *resultFile);
+        uint16_t port, char* sqlstr, threadInfo *pThreadInfo);
+static int64_t getTSRandTail(int64_t timeStampStep, int32_t seq,
+        int disorderRatio, int disorderRange);
 /* ************ Global variables ************  */
@@ -922,6 +930,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
                && strcasecmp(argv[i], "BIGINT")
                && strcasecmp(argv[i], "DOUBLE")
                && strcasecmp(argv[i], "BINARY")
+                && strcasecmp(argv[i], "TIMESTAMP")
                && strcasecmp(argv[i], "NCHAR")) {
          printHelp();
          errorPrint("%s", "-b: Invalid data_type!\n");
@@ -943,6 +952,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
                  && strcasecmp(token, "BIGINT")
                  && strcasecmp(token, "DOUBLE")
                  && strcasecmp(token, "BINARY")
+                  && strcasecmp(token, "TIMESTAMP")
                  && strcasecmp(token, "NCHAR")) {
            printHelp();
            free(g_dupstr);
@@ -1066,7 +1076,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
    }
    printf("# Insertion interval:                %"PRIu64"\n",
            arguments->insert_interval);
-    printf("# Number of records per req:         %"PRIu64"\n",
+    printf("# Number of records per req:         %ud\n",
            arguments->num_of_RPR);
    printf("# Max SQL length:                    %"PRIu64"\n",
            arguments->max_sql_len);
@@ -1125,10 +1135,11 @@ static int queryDbExec(TAOS *taos, char *command, QUERY_TYPE type, bool quiet) {
    }
  }
+  verbosePrint("%s() LN%d - command: %s\n", __func__, __LINE__, command);
  if (code != 0) {
    if (!quiet) {
-      debugPrint("%s() LN%d - command: %s\n", __func__, __LINE__, command);
+      errorPrint("Failed to execute %s, reason: %s\n",
-      errorPrint("Failed to execute %s, reason: %s\n", command, taos_errstr(res));
+              command, taos_errstr(res));
    }
    taos_free_result(res);
    //taos_close(taos);
@@ -1145,24 +1156,22 @@ static int queryDbExec(TAOS *taos, char *command, QUERY_TYPE type, bool quiet) {
  return 0;
 }
-static void appendResultBufToFile(char *resultBuf, char *resultFile)
+static void appendResultBufToFile(char *resultBuf, threadInfo *pThreadInfo)
 {
-  FILE *fp = NULL;
+  pThreadInfo->fp = fopen(pThreadInfo->filePath, "at");
-  if (resultFile[0] != 0) {
+  if (pThreadInfo->fp == NULL) {
-    fp = fopen(resultFile, "at");
-    if (fp == NULL) {
      errorPrint(
              "%s() LN%d, failed to open result file: %s, result will not save to file\n",
-              __func__, __LINE__, resultFile);
+              __func__, __LINE__, pThreadInfo->filePath);
      return;
-    }
  }
-  fprintf(fp, "%s", resultBuf);
+  fprintf(pThreadInfo->fp, "%s", resultBuf);
-  tmfclose(fp);
+  tmfclose(pThreadInfo->fp);
+  pThreadInfo->fp = NULL;
 }
-static void appendResultToFile(TAOS_RES *res, char* resultFile) {
+static void fetchResult(TAOS_RES *res, threadInfo* pThreadInfo) {
  TAOS_ROW    row = NULL;
  int         num_rows = 0;
  int         num_fields = taos_field_count(res);
@@ -1180,10 +1189,11 @@ static void appendResultToFile(TAOS_RES *res, char* resultFile) {
  // fetch the records row by row
  while((row = taos_fetch_row(res))) {
-    if (totalLen >= 100*1024*1024 - 32000) {
+    if ((strlen(pThreadInfo->filePath) > 0)
-      appendResultBufToFile(databuf, resultFile);
+            && (totalLen >= 100*1024*1024 - 32000)) {
-      totalLen = 0;
+        appendResultBufToFile(databuf, pThreadInfo);
-      memset(databuf, 0, 100*1024*1024);
+        totalLen = 0;
+        memset(databuf, 0, 100*1024*1024);
    }
    num_rows++;
    int len = taos_print_row(temp, row, fields, num_fields);
@@ -1194,8 +1204,10 @@ static void appendResultToFile(TAOS_RES *res, char* resultFile) {
  }
  verbosePrint("%s() LN%d, databuf=%s resultFile=%s\n",
-          __func__, __LINE__, databuf, resultFile);
+          __func__, __LINE__, databuf, pThreadInfo->filePath);
-  appendResultBufToFile(databuf, resultFile);
+  if (strlen(pThreadInfo->filePath) > 0) {
+    appendResultBufToFile(databuf, pThreadInfo);
+  }
  free(databuf);
 }
@@ -1211,16 +1223,14 @@ static void selectAndGetResult(
        return;
    }
-    if ((strlen(pThreadInfo->fp))) {
+    fetchResult(res, pThreadInfo);
-      appendResultToFile(res, pThreadInfo->fp);
-    }
    taos_free_result(res);
  } else if (0 == strncasecmp(g_queryInfo.queryMode, "rest", strlen("rest"))) {
      int retCode = postProceSql(
              g_queryInfo.host, &(g_queryInfo.serv_addr), g_queryInfo.port,
              command,
-              pThreadInfo->fp);
+              pThreadInfo);
      if (0 != retCode) {
        printf("====restful return fail, threadID[%d]\n", pThreadInfo->threadID);
      }
@@ -1358,7 +1368,7 @@ static int printfInsertMeta() {
          g_Dbs.threadCountByCreateTbl);
  printf("top insert interval:        \033[33m%"PRIu64"\033[0m\n",
          g_args.insert_interval);
-  printf("number of records per req:  \033[33m%"PRIu64"\033[0m\n",
+  printf("number of records per req:  \033[33m%ud\033[0m\n",
          g_args.num_of_RPR);
  printf("max sql length:             \033[33m%"PRIu64"\033[0m\n",
          g_args.max_sql_len);
@@ -1464,9 +1474,9 @@ static int printfInsertMeta() {
              g_Dbs.db[i].superTbls[j].childTblPrefix);
      printf("      dataSource:        \033[33m%s\033[0m\n",
              g_Dbs.db[i].superTbls[j].dataSource);
-      printf("      insertMode:        \033[33m%s\033[0m\n",
+      printf("      iface:             \033[33m%s\033[0m\n",
-          (g_Dbs.db[i].superTbls[j].insertMode==TAOSC_IFACE)?"taosc":
+          (g_Dbs.db[i].superTbls[j].iface==TAOSC_IFACE)?"taosc":
-          (g_Dbs.db[i].superTbls[j].insertMode==REST_IFACE)?"rest":"stmt");
+          (g_Dbs.db[i].superTbls[j].iface==REST_IFACE)?"rest":"stmt");
      if (g_Dbs.db[i].superTbls[j].childTblLimit > 0) {
        printf("      childTblLimit:     \033[33m%"PRId64"\033[0m\n",
                g_Dbs.db[i].superTbls[j].childTblLimit);
@@ -1484,7 +1494,7 @@ static int printfInsertMeta() {
        printf("      multiThreadWriteOneTbl:  \033[33myes\033[0m\n");
      }
      */
-      printf("      interlaceRows:     \033[33m%"PRIu64"\033[0m\n",
+      printf("      interlaceRows:     \033[33m%ud\033[0m\n",
              g_Dbs.db[i].superTbls[j].interlaceRows);
      if (g_Dbs.db[i].superTbls[j].interlaceRows > 0) {
@@ -1562,7 +1572,7 @@ static void printfInsertMetaToFile(FILE* fp) {
  fprintf(fp, "resultFile:                 %s\n", g_Dbs.resultFile);
  fprintf(fp, "thread num of insert data:  %d\n", g_Dbs.threadCount);
  fprintf(fp, "thread num of create table: %d\n", g_Dbs.threadCountByCreateTbl);
-  fprintf(fp, "number of records per req:  %"PRIu64"\n", g_args.num_of_RPR);
+  fprintf(fp, "number of records per req:  %ud\n", g_args.num_of_RPR);
  fprintf(fp, "max sql length:             %"PRIu64"\n", g_args.max_sql_len);
  fprintf(fp, "database count:          %d\n", g_Dbs.dbCount);
@@ -1654,12 +1664,12 @@ static void printfInsertMetaToFile(FILE* fp) {
              g_Dbs.db[i].superTbls[j].childTblPrefix);
      fprintf(fp, "      dataSource:        %s\n",
              g_Dbs.db[i].superTbls[j].dataSource);
-      fprintf(fp, "      insertMode:        %s\n",
+      fprintf(fp, "      iface:             %s\n",
-          (g_Dbs.db[i].superTbls[j].insertMode==TAOSC_IFACE)?"taosc":
+          (g_Dbs.db[i].superTbls[j].iface==TAOSC_IFACE)?"taosc":
-          (g_Dbs.db[i].superTbls[j].insertMode==REST_IFACE)?"rest":"stmt");
+          (g_Dbs.db[i].superTbls[j].iface==REST_IFACE)?"rest":"stmt");
      fprintf(fp, "      insertRows:        %"PRId64"\n",
              g_Dbs.db[i].superTbls[j].insertRows);
-      fprintf(fp, "      interlace rows:    %"PRIu64"\n",
+      fprintf(fp, "      interlace rows:    %ud\n",
              g_Dbs.db[i].superTbls[j].interlaceRows);
      if (g_Dbs.db[i].superTbls[j].interlaceRows > 0) {
        fprintf(fp, "      stable insert interval:   %"PRIu64"\n",
@@ -1672,7 +1682,7 @@ static void printfInsertMetaToFile(FILE* fp) {
        fprintf(fp, "      multiThreadWriteOneTbl:  yes\n");
      }
      */
-      fprintf(fp, "      interlaceRows:     %"PRIu64"\n",
+      fprintf(fp, "      interlaceRows:     %ud\n",
              g_Dbs.db[i].superTbls[j].interlaceRows);
      fprintf(fp, "      disorderRange:     %d\n",
              g_Dbs.db[i].superTbls[j].disorderRange);
@@ -1757,7 +1767,7 @@ static void printfQueryMeta() {
      printf("query interval: \033[33m%"PRIu64" ms\033[0m\n",
        g_queryInfo.specifiedQueryInfo.queryInterval);
      printf("top query times:\033[33m%"PRIu64"\033[0m\n", g_args.query_times);
-      printf("concurrent:     \033[33m%"PRIu64"\033[0m\n",
+      printf("concurrent:     \033[33m%d\033[0m\n",
      g_queryInfo.specifiedQueryInfo.concurrent);
      printf("mod:            \033[33m%s\033[0m\n",
        (g_queryInfo.specifiedQueryInfo.asyncMode)?"async":"sync");
@@ -2054,13 +2064,13 @@ static void printfQuerySystemInfo(TAOS * taos) {
  // show variables
  res = taos_query(taos, "show variables;");
-  //appendResultToFile(res, filename);
+  //fetchResult(res, filename);
  xDumpResultToFile(filename, res);
  // show dnodes
  res = taos_query(taos, "show dnodes;");
  xDumpResultToFile(filename, res);
-  //appendResultToFile(res, filename);
+  //fetchResult(res, filename);
  // show databases
  res = taos_query(taos, "show databases;");
@@ -2096,7 +2106,7 @@ static void printfQuerySystemInfo(TAOS * taos) {
 }
 static int postProceSql(char *host, struct sockaddr_in *pServAddr, uint16_t port,
-        char* sqlstr, char *resultFile)
+        char* sqlstr, threadInfo *pThreadInfo)
 {
    char *req_fmt = "POST %s HTTP/1.1\r\nHost: %s:%d\r\nAccept: */*\r\nAuthorization: Basic %s\r\nContent-Length: %d\r\nContent-Type: application/x-www-form-urlencoded\r\n\r\n%s";
@@ -2232,8 +2242,8 @@ static int postProceSql(char *host, struct sockaddr_in *pServAddr, uint16_t port
    response_buf[RESP_BUF_LEN - 1] = '\0';
    printf("Response:\n%s\n", response_buf);
-    if (resultFile) {
+    if (strlen(pThreadInfo->filePath) > 0) {
-       appendResultBufToFile(response_buf, resultFile);
+       appendResultBufToFile(response_buf, pThreadInfo);
    }
    free(request_buf);
@@ -2725,8 +2735,6 @@ static int createSuperTable(
  snprintf(command, BUFFER_SIZE,
          "create table if not exists %s.%s (ts timestamp%s) tags %s",
          dbName, superTbl->sTblName, cols, tags);
-  verbosePrint("%s() LN%d: %s\n", __func__, __LINE__, command);
  if (0 != queryDbExec(taos, command, NO_INSERT_TYPE, false)) {
      errorPrint( "create supertable %s failed!\n\n",
              superTbl->sTblName);
@@ -2749,7 +2757,6 @@ static int createDatabasesAndStables() {
  for (int i = 0; i < g_Dbs.dbCount; i++) {
    if (g_Dbs.db[i].drop) {
      sprintf(command, "drop database if exists %s;", g_Dbs.db[i].dbName);
-      verbosePrint("%s() %d command: %s\n", __func__, __LINE__, command);
      if (0 != queryDbExec(taos, command, NO_INSERT_TYPE, false)) {
        taos_close(taos);
        return -1;
@@ -2822,7 +2829,6 @@ static int createDatabasesAndStables() {
                " precision \'%s\';", g_Dbs.db[i].dbCfg.precision);
      }
-      debugPrint("%s() %d command: %s\n", __func__, __LINE__, command);
      if (0 != queryDbExec(taos, command, NO_INSERT_TYPE, false)) {
        taos_close(taos);
        errorPrint( "\ncreate database %s failed!\n\n", g_Dbs.db[i].dbName);
@@ -2839,8 +2845,6 @@ static int createDatabasesAndStables() {
    for (uint64_t j = 0; j < g_Dbs.db[i].superTblCount; j++) {
      sprintf(command, "describe %s.%s;", g_Dbs.db[i].dbName,
              g_Dbs.db[i].superTbls[j].sTblName);
-      verbosePrint("%s() %d command: %s\n", __func__, __LINE__, command);
      ret = queryDbExec(taos, command, NO_INSERT_TYPE, true);
      if ((ret != 0) || (g_Dbs.db[i].drop)) {
@@ -2944,7 +2948,6 @@ static void* createTable(void *sarg)
    }
    len = 0;
-    verbosePrint("%s() LN%d %s\n", __func__, __LINE__, buffer);
    if (0 != queryDbExec(pThreadInfo->taos, buffer, NO_INSERT_TYPE, false)){
      errorPrint( "queryDbExec() failed. buffer:\n%s\n", buffer);
      free(buffer);
@@ -2960,7 +2963,6 @@ static void* createTable(void *sarg)
  }
  if (0 != len) {
-    verbosePrint("%s() %d buffer: %s\n", __func__, __LINE__, buffer);
    if (0 != queryDbExec(pThreadInfo->taos, buffer, NO_INSERT_TYPE, false)) {
      errorPrint( "queryDbExec() failed. buffer:\n%s\n", buffer);
    }
@@ -2971,7 +2973,7 @@ static void* createTable(void *sarg)
 }
 static int startMultiThreadCreateChildTable(
-        char* cols, int threads, uint64_t startFrom, int64_t ntables,
+        char* cols, int threads, uint64_t tableFrom, int64_t ntables,
        char* db_name, SSuperTable* superTblInfo) {
  pthread_t *pids = malloc(threads * sizeof(pthread_t));
@@ -2995,19 +2997,19 @@ static int startMultiThreadCreateChildTable(
  int64_t b = 0;
  b = ntables % threads;
-  for (int i = 0; i < threads; i++) {
+  for (int64_t i = 0; i < threads; i++) {
-    threadInfo *t_info = infos + i;
+    threadInfo *pThreadInfo = infos + i;
-    t_info->threadID = i;
+    pThreadInfo->threadID = i;
-    tstrncpy(t_info->db_name, db_name, MAX_DB_NAME_SIZE);
+    tstrncpy(pThreadInfo->db_name, db_name, MAX_DB_NAME_SIZE);
-    t_info->superTblInfo = superTblInfo;
+    pThreadInfo->superTblInfo = superTblInfo;
    verbosePrint("%s() %d db_name: %s\n", __func__, __LINE__, db_name);
-    t_info->taos = taos_connect(
+    pThreadInfo->taos = taos_connect(
            g_Dbs.host,
            g_Dbs.user,
            g_Dbs.password,
            db_name,
            g_Dbs.port);
-    if (t_info->taos == NULL) {
+    if (pThreadInfo->taos == NULL) {
      errorPrint( "%s() LN%d, Failed to connect to TDengine, reason:%s\n",
         __func__, __LINE__, taos_errstr(NULL));
      free(pids);
@@ -3015,14 +3017,14 @@ static int startMultiThreadCreateChildTable(
      return -1;
    }
-    t_info->start_table_from = startFrom;
+    pThreadInfo->start_table_from = tableFrom;
-    t_info->ntables = i<b?a+1:a;
+    pThreadInfo->ntables = i<b?a+1:a;
-    t_info->end_table_to = i < b ? startFrom + a : startFrom + a - 1;
+    pThreadInfo->end_table_to = i < b ? tableFrom + a : tableFrom + a - 1;
-    startFrom = t_info->end_table_to + 1;
+    tableFrom = pThreadInfo->end_table_to + 1;
-    t_info->use_metric = true;
+    pThreadInfo->use_metric = true;
-    t_info->cols = cols;
+    pThreadInfo->cols = cols;
-    t_info->minDelay = UINT64_MAX;
+    pThreadInfo->minDelay = UINT64_MAX;
-    pthread_create(pids + i, NULL, createTable, t_info);
+    pthread_create(pids + i, NULL, createTable, pThreadInfo);
  }
  for (int i = 0; i < threads; i++) {
@@ -3030,8 +3032,8 @@ static int startMultiThreadCreateChildTable(
  }
  for (int i = 0; i < threads; i++) {
-    threadInfo *t_info = infos + i;
+    threadInfo *pThreadInfo = infos + i;
-    taos_close(t_info->taos);
+    taos_close(pThreadInfo->taos);
  }
  free(pids);
@@ -3056,15 +3058,15 @@ static void createChildTables() {
          verbosePrint("%s() LN%d: %s\n", __func__, __LINE__,
                  g_Dbs.db[i].superTbls[j].colsOfCreateChildTable);
-          uint64_t startFrom = 0;
+          uint64_t tableFrom = 0;
          g_totalChildTables += g_Dbs.db[i].superTbls[j].childTblCount;
          verbosePrint("%s() LN%d: create %"PRId64" child tables from %"PRIu64"\n",
-                  __func__, __LINE__, g_totalChildTables, startFrom);
+                  __func__, __LINE__, g_totalChildTables, tableFrom);
          startMultiThreadCreateChildTable(
                g_Dbs.db[i].superTbls[j].colsOfCreateChildTable,
                g_Dbs.threadCountByCreateTbl,
-                startFrom,
+                tableFrom,
                g_Dbs.db[i].superTbls[j].childTblCount,
                g_Dbs.db[i].dbName, &(g_Dbs.db[i].superTbls[j]));
        }
@@ -3559,9 +3561,9 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
  // rows per table need be less than insert batch
  if (g_args.interlace_rows > g_args.num_of_RPR) {
-      printf("NOTICE: interlace rows value %"PRIu64" > num_of_records_per_req %"PRIu64"\n\n",
+      printf("NOTICE: interlace rows value %ud > num_of_records_per_req %ud\n\n",
              g_args.interlace_rows, g_args.num_of_RPR);
-      printf("        interlace rows value will be set to num_of_records_per_req %"PRIu64"\n\n",
+      printf("        interlace rows value will be set to num_of_records_per_req %ud\n\n",
              g_args.num_of_RPR);
      prompt();
      g_args.interlace_rows = g_args.num_of_RPR;
@@ -3876,22 +3878,22 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
        goto PARSE_OVER;
      }
-      cJSON *insertMode = cJSON_GetObjectItem(stbInfo, "insert_mode"); // taosc , rest, stmt
+      cJSON *stbIface = cJSON_GetObjectItem(stbInfo, "insert_mode"); // taosc , rest, stmt
-      if (insertMode && insertMode->type == cJSON_String
+      if (stbIface && stbIface->type == cJSON_String
-              && insertMode->valuestring != NULL) {
+              && stbIface->valuestring != NULL) {
-        if (0 == strcasecmp(insertMode->valuestring, "taosc")) {
+        if (0 == strcasecmp(stbIface->valuestring, "taosc")) {
-            g_Dbs.db[i].superTbls[j].insertMode = TAOSC_IFACE;
+            g_Dbs.db[i].superTbls[j].iface= TAOSC_IFACE;
-        } else if (0 == strcasecmp(insertMode->valuestring, "rest")) {
+        } else if (0 == strcasecmp(stbIface->valuestring, "rest")) {
-            g_Dbs.db[i].superTbls[j].insertMode = REST_IFACE;
+            g_Dbs.db[i].superTbls[j].iface= REST_IFACE;
-        } else if (0 == strcasecmp(insertMode->valuestring, "stmt")) {
+        } else if (0 == strcasecmp(stbIface->valuestring, "stmt")) {
-            g_Dbs.db[i].superTbls[j].insertMode = STMT_IFACE;
+            g_Dbs.db[i].superTbls[j].iface= STMT_IFACE;
        } else {
            errorPrint("%s() LN%d, failed to read json, insert_mode %s not recognized\n",
-                    __func__, __LINE__, insertMode->valuestring);
+                    __func__, __LINE__, stbIface->valuestring);
            goto PARSE_OVER;
        }
-      } else if (!insertMode) {
+      } else if (!stbIface) {
-        g_Dbs.db[i].superTbls[j].insertMode = TAOSC_IFACE;
+        g_Dbs.db[i].superTbls[j].iface = TAOSC_IFACE;
      } else {
        errorPrint("%s", "failed to read json, insert_mode not found\n");
        goto PARSE_OVER;
@@ -4028,9 +4030,10 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
        g_Dbs.db[i].superTbls[j].interlaceRows = stbInterlaceRows->valueint;
        // rows per table need be less than insert batch
        if (g_Dbs.db[i].superTbls[j].interlaceRows > g_args.num_of_RPR) {
-          printf("NOTICE: db[%d].superTbl[%d]'s interlace rows value %"PRIu64" > num_of_records_per_req %"PRIu64"\n\n",
+          printf("NOTICE: db[%d].superTbl[%d]'s interlace rows value %ud > num_of_records_per_req %ud\n\n",
-                  i, j, g_Dbs.db[i].superTbls[j].interlaceRows, g_args.num_of_RPR);
+                  i, j, g_Dbs.db[i].superTbls[j].interlaceRows,
-          printf("        interlace rows value will be set to num_of_records_per_req %"PRIu64"\n\n",
+                  g_args.num_of_RPR);
+          printf("        interlace rows value will be set to num_of_records_per_req %ud\n\n",
                  g_args.num_of_RPR);
          prompt();
          g_Dbs.db[i].superTbls[j].interlaceRows = g_args.num_of_RPR;
@@ -4247,7 +4250,7 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
    if (concurrent && concurrent->type == cJSON_Number) {
      if (concurrent->valueint <= 0) {
        errorPrint(
-                "%s() LN%d, query sqlCount %"PRIu64" or concurrent %"PRIu64" is not correct.\n",
+                "%s() LN%d, query sqlCount %"PRIu64" or concurrent %d is not correct.\n",
              __func__, __LINE__,
              g_queryInfo.specifiedQueryInfo.sqlCount,
              g_queryInfo.specifiedQueryInfo.concurrent);
@@ -4314,24 +4317,28 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
    }
    // sqls
-    cJSON* superSqls = cJSON_GetObjectItem(specifiedQuery, "sqls");
+    cJSON* specifiedSqls = cJSON_GetObjectItem(specifiedQuery, "sqls");
-    if (!superSqls) {
+    if (!specifiedSqls) {
      g_queryInfo.specifiedQueryInfo.sqlCount = 0;
-    } else if (superSqls->type != cJSON_Array) {
+    } else if (specifiedSqls->type != cJSON_Array) {
      errorPrint("%s() LN%d, failed to read json, super sqls not found\n",
          __func__, __LINE__);
      goto PARSE_OVER;
    } else {
-      int superSqlSize = cJSON_GetArraySize(superSqls);
+      int superSqlSize = cJSON_GetArraySize(specifiedSqls);
-      if (superSqlSize > MAX_QUERY_SQL_COUNT) {
+      if (superSqlSize * g_queryInfo.specifiedQueryInfo.concurrent
-        errorPrint("%s() LN%d, failed to read json, query sql size overflow, max is %d\n",
+              > MAX_QUERY_SQL_COUNT) {
-           __func__, __LINE__, MAX_QUERY_SQL_COUNT);
+        errorPrint("%s() LN%d, failed to read json, query sql(%d) * concurrent(%d) overflow, max is %d\n",
+           __func__, __LINE__,
+           superSqlSize,
+           g_queryInfo.specifiedQueryInfo.concurrent,
+           MAX_QUERY_SQL_COUNT);
        goto PARSE_OVER;
      }
      g_queryInfo.specifiedQueryInfo.sqlCount = superSqlSize;
      for (int j = 0; j < superSqlSize; ++j) {
-        cJSON* sql = cJSON_GetArrayItem(superSqls, j);
+        cJSON* sql = cJSON_GetArrayItem(specifiedSqls, j);
        if (sql == NULL) continue;
        cJSON *sqlStr = cJSON_GetObjectItem(sql, "sql");
@@ -4495,16 +4502,28 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
      g_queryInfo.superQueryInfo.subscribeKeepProgress = 0;
    }
-    // sqls
+    cJSON* superResubAfterConsume =
-    cJSON* subsqls = cJSON_GetObjectItem(superQuery, "sqls");
+            cJSON_GetObjectItem(superQuery, "resubAfterConsume");
-    if (!subsqls) {
+    if (superResubAfterConsume
+            && superResubAfterConsume->type == cJSON_Number) {
+        g_queryInfo.superQueryInfo.resubAfterConsume =
+            superResubAfterConsume->valueint;
+    } else if (!superResubAfterConsume) {
+        //printf("failed to read json, subscribe interval no found\n");
+        ////goto PARSE_OVER;
+        g_queryInfo.superQueryInfo.resubAfterConsume = 1;
+    }
+    // supert table sqls
+    cJSON* superSqls = cJSON_GetObjectItem(superQuery, "sqls");
+    if (!superSqls) {
      g_queryInfo.superQueryInfo.sqlCount = 0;
-    } else if (subsqls->type != cJSON_Array) {
+    } else if (superSqls->type != cJSON_Array) {
      errorPrint("%s() LN%d: failed to read json, super sqls not found\n",
          __func__, __LINE__);
      goto PARSE_OVER;
    } else {
-      int superSqlSize = cJSON_GetArraySize(subsqls);
+      int superSqlSize = cJSON_GetArraySize(superSqls);
      if (superSqlSize > MAX_QUERY_SQL_COUNT) {
        errorPrint("%s() LN%d, failed to read json, query sql size overflow, max is %d\n",
           __func__, __LINE__, MAX_QUERY_SQL_COUNT);
@@ -4513,7 +4532,7 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
      g_queryInfo.superQueryInfo.sqlCount = superSqlSize;
      for (int j = 0; j < superSqlSize; ++j) {
-        cJSON* sql = cJSON_GetArrayItem(subsqls, j);
+        cJSON* sql = cJSON_GetArrayItem(superSqls, j);
        if (sql == NULL) continue;
        cJSON *sqlStr = cJSON_GetObjectItem(sql, "sql");
@@ -4526,18 +4545,6 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
        tstrncpy(g_queryInfo.superQueryInfo.sql[j], sqlStr->valuestring,
            MAX_QUERY_SQL_LENGTH);
-        cJSON* superResubAfterConsume =
-            cJSON_GetObjectItem(sql, "resubAfterConsume");
-        if (superResubAfterConsume
-                && superResubAfterConsume->type == cJSON_Number) {
-            g_queryInfo.superQueryInfo.resubAfterConsume[j] =
-                superResubAfterConsume->valueint;
-        } else if (!superResubAfterConsume) {
-            //printf("failed to read json, subscribe interval no found\n");
-            //goto PARSE_OVER;
-            g_queryInfo.superQueryInfo.resubAfterConsume[j] = 1;
-        }
        cJSON *result = cJSON_GetObjectItem(sql, "result");
        if (result != NULL && result->type == cJSON_String
            && result->valuestring != NULL){
@@ -4687,8 +4694,8 @@ static int getRowDataFromSample(
 static int64_t generateStbRowData(
        SSuperTable* stbInfo,
-        char* recBuf, int64_t timestamp
+        char* recBuf, int64_t timestamp)
-        ) {
+{
  int64_t   dataLen = 0;
  char  *pstr = recBuf;
  int64_t maxLen = MAX_DATA_SIZE;
@@ -4716,23 +4723,23 @@ static int64_t generateStbRowData(
      dataLen += snprintf(pstr + dataLen, maxLen - dataLen, "\'%s\',", buf);
      tmfree(buf);
    } else if (0 == strncasecmp(stbInfo->columns[i].dataType,
-                "INT", 3)) {
+                "INT", strlen("INT"))) {
      dataLen += snprintf(pstr + dataLen, maxLen - dataLen,
              "%d,", rand_int());
    } else if (0 == strncasecmp(stbInfo->columns[i].dataType,
-                "BIGINT", 6)) {
+                "BIGINT", strlen("BIGINT"))) {
      dataLen += snprintf(pstr + dataLen, maxLen - dataLen,
              "%"PRId64",", rand_bigint());
    }  else if (0 == strncasecmp(stbInfo->columns[i].dataType,
-                "FLOAT", 5)) {
+                "FLOAT", strlen("FLOAT"))) {
      dataLen += snprintf(pstr + dataLen, maxLen - dataLen,
              "%f,", rand_float());
    }  else if (0 == strncasecmp(stbInfo->columns[i].dataType,
-                "DOUBLE", 6)) {
+                "DOUBLE", strlen("DOUBLE"))) {
      dataLen += snprintf(pstr + dataLen, maxLen - dataLen,
              "%f,", rand_double());
    }  else if (0 == strncasecmp(stbInfo->columns[i].dataType,
-                "SMALLINT", 8)) {
+                "SMALLINT", strlen("SMALLINT"))) {
      dataLen += snprintf(pstr + dataLen, maxLen - dataLen,
          "%d,", rand_smallint());
    }  else if (0 == strncasecmp(stbInfo->columns[i].dataType,
@@ -4788,6 +4795,8 @@ static int64_t generateData(char *recBuf, char **data_type,
      pstr += sprintf(pstr, ",%d", rand_int());
    } else if (strcasecmp(data_type[i % c], "BIGINT") == 0) {
      pstr += sprintf(pstr, ",%" PRId64, rand_bigint());
+    } else if (strcasecmp(data_type[i % c], "TIMESTAMP") == 0) {
+      pstr += sprintf(pstr, ",%" PRId64, rand_bigint());
    } else if (strcasecmp(data_type[i % c], "FLOAT") == 0) {
      pstr += sprintf(pstr, ",%10.4f", rand_float());
    } else if (strcasecmp(data_type[i % c], "DOUBLE") == 0) {
@@ -4856,11 +4865,11 @@ static int64_t execInsert(threadInfo *pThreadInfo, uint64_t k)
  verbosePrint("[%d] %s() LN%d %s\n", pThreadInfo->threadID,
            __func__, __LINE__, pThreadInfo->buffer);
  if (superTblInfo) {
-    if (superTblInfo->insertMode == TAOSC_IFACE) {
+    if (superTblInfo->iface == TAOSC_IFACE) {
      affectedRows = queryDbExec(
              pThreadInfo->taos,
              pThreadInfo->buffer, INSERT_TYPE, false);
-    } else if (superTblInfo->insertMode == REST_IFACE) {
+    } else if (superTblInfo->iface == REST_IFACE) {
      if (0 != postProceSql(g_Dbs.host, &g_Dbs.serv_addr, g_Dbs.port,
                  pThreadInfo->buffer, NULL /* not set result file */)) {
        affectedRows = -1;
@@ -4869,7 +4878,7 @@ static int64_t execInsert(threadInfo *pThreadInfo, uint64_t k)
      } else {
        affectedRows = k;
      }
-    } else if (superTblInfo->insertMode == STMT_IFACE) {
+    } else if (superTblInfo->iface == STMT_IFACE) {
      debugPrint("%s() LN%d, stmt=%p", __func__, __LINE__, pThreadInfo->stmt);
      if (0 != taos_stmt_execute(pThreadInfo->stmt)) {
        errorPrint("%s() LN%d, failied to execute insert statement\n",
@@ -4880,7 +4889,7 @@ static int64_t execInsert(threadInfo *pThreadInfo, uint64_t k)
      affectedRows = k;
    } else {
      errorPrint("%s() LN%d: unknown insert mode: %d\n",
-        __func__, __LINE__, superTblInfo->insertMode);
+        __func__, __LINE__, superTblInfo->iface);
      affectedRows = 0;
    }
  } else {
@@ -4916,15 +4925,15 @@ static void getTableName(char *pTblName,
 }
 static int64_t generateDataTailWithoutStb(
-        uint64_t batch, char* buffer,
+        uint32_t batch, char* buffer,
        int64_t remainderBufLen, int64_t insertRows,
-        uint64_t startFrom, int64_t startTime,
+        uint64_t recordFrom, int64_t startTime,
        /* int64_t *pSamplePos, */int64_t *dataLen) {
  uint64_t len = 0;
  char *pstr = buffer;
-  verbosePrint("%s() LN%d batch=%"PRIu64"\n", __func__, __LINE__, batch);
+  verbosePrint("%s() LN%d batch=%d\n", __func__, __LINE__, batch);
  int64_t k = 0;
  for (k = 0; k < batch;) {
@@ -4936,22 +4945,11 @@ static int64_t generateDataTailWithoutStb(
    char **data_type = g_args.datatype;
    int lenOfBinary = g_args.len_of_binary;
-    int64_t randTail = DEFAULT_TIMESTAMP_STEP * k;
-    if (g_args.disorderRatio != 0) {
-        int rand_num = taosRandom() % 100;
-        if (rand_num < g_args.disorderRatio) {
-          randTail = (randTail +
-                  (taosRandom() % g_args.disorderRange + 1)) * (-1);
-          debugPrint("rand data generated, back %"PRId64"\n", randTail);
-        }
-    } else {
-        randTail = DEFAULT_TIMESTAMP_STEP * k;
-    }
    retLen = generateData(data, data_type,
-            startTime + randTail,
+            startTime + getTSRandTail(
+                (int64_t)DEFAULT_TIMESTAMP_STEP, k,
+                g_args.disorderRatio,
+                g_args.disorderRange),
            lenOfBinary);
    if (len > remainderBufLen)
@@ -4965,9 +4963,9 @@ static int64_t generateDataTailWithoutStb(
    verbosePrint("%s() LN%d len=%"PRIu64" k=%"PRIu64" \nbuffer=%s\n",
            __func__, __LINE__, len, k, buffer);
-    startFrom ++;
+    recordFrom ++;
-    if (startFrom >= insertRows) {
+    if (recordFrom >= insertRows) {
      break;
    }
  }
@@ -4976,47 +4974,61 @@ static int64_t generateDataTailWithoutStb(
  return k;
 }
-static int64_t generateStbDataTail(
+static int64_t getTSRandTail(int64_t timeStampStep, int32_t seq,
+        int disorderRatio, int disorderRange)
+{
+    int64_t randTail = timeStampStep * seq;
+    if (disorderRatio > 0) {
+        int rand_num = taosRandom() % 100;
+        if(rand_num < disorderRatio) {
+            randTail = (randTail +
+                    (taosRandom() % disorderRange + 1)) * (-1);
+            debugPrint("rand data generated, back %"PRId64"\n", randTail);
+        }
+    }
+    return randTail;
+}
+static int32_t generateStbDataTail(
        SSuperTable* superTblInfo,
-        uint64_t batch, char* buffer,
+        uint32_t batch, char* buffer,
        int64_t remainderBufLen, int64_t insertRows,
-        uint64_t startFrom, int64_t startTime,
+        uint64_t recordFrom, int64_t startTime,
        int64_t *pSamplePos, int64_t *dataLen) {
  uint64_t len = 0;
  char *pstr = buffer;
-  verbosePrint("%s() LN%d batch=%"PRIu64"\n", __func__, __LINE__, batch);
+  bool tsRand;
+  if (0 == strncasecmp(superTblInfo->dataSource, "rand", strlen("rand"))) {
+      tsRand = true;
+  } else {
+      tsRand = false;
+  }
+  verbosePrint("%s() LN%d batch=%ud\n", __func__, __LINE__, batch);
-  int64_t k = 0;
+  int32_t k = 0;
  for (k = 0; k < batch;) {
    char data[MAX_DATA_SIZE];
    memset(data, 0, MAX_DATA_SIZE);
    int64_t retLen = 0;
-    if (0 == strncasecmp(superTblInfo->dataSource,
+    if (tsRand) {
-                "sample", strlen("sample"))) {
+        retLen = generateStbRowData(superTblInfo, data,
-          retLen = getRowDataFromSample(
+                startTime + getTSRandTail(
+                    superTblInfo->timeStampStep, k,
+                    superTblInfo->disorderRatio,
+                    superTblInfo->disorderRange)
+                );
+    } else {
+        retLen = getRowDataFromSample(
                  data,
                  remainderBufLen,
                  startTime + superTblInfo->timeStampStep * k,
                  superTblInfo,
                  pSamplePos);
-    } else if (0 == strncasecmp(superTblInfo->dataSource,
-                "rand", strlen("rand"))) {
-        int64_t randTail = superTblInfo->timeStampStep * k;
-        if (superTblInfo->disorderRatio > 0) {
-            int rand_num = taosRandom() % 100;
-            if(rand_num < superTblInfo->disorderRatio) {
-                randTail = (randTail +
-                        (taosRandom() % superTblInfo->disorderRange + 1)) * (-1);
-                debugPrint("rand data generated, back %"PRId64"\n", randTail);
-            }
-        }
-        int64_t d = startTime + randTail;
-        retLen = generateStbRowData(superTblInfo, data, d);
    }
    if (retLen > remainderBufLen) {
@@ -5028,12 +5040,12 @@ static int64_t generateStbDataTail(
    len += retLen;
    remainderBufLen -= retLen;
-    verbosePrint("%s() LN%d len=%"PRIu64" k=%"PRIu64" \nbuffer=%s\n",
+    verbosePrint("%s() LN%d len=%"PRIu64" k=%ud \nbuffer=%s\n",
            __func__, __LINE__, len, k, buffer);
-    startFrom ++;
+    recordFrom ++;
-    if (startFrom >= insertRows) {
+    if (recordFrom >= insertRows) {
      break;
    }
  }
@@ -5125,9 +5137,11 @@ static int generateStbSQLHead(
  return len;
 }
-static int64_t generateStbInterlaceData(
+static int32_t generateStbInterlaceData(
        SSuperTable *superTblInfo,
-        char *tableName, uint64_t batchPerTbl, uint64_t i, uint64_t batchPerTblTimes,
+        char *tableName, uint32_t batchPerTbl,
+        uint64_t i,
+        uint32_t batchPerTblTimes,
        uint64_t tableSeq,
        threadInfo *pThreadInfo, char *buffer,
        int64_t insertRows,
@@ -5154,7 +5168,7 @@ static int64_t generateStbInterlaceData(
  int64_t dataLen = 0;
-  verbosePrint("[%d] %s() LN%d i=%"PRIu64" batchPerTblTimes=%"PRIu64" batchPerTbl = %"PRIu64"\n",
+  verbosePrint("[%d] %s() LN%d i=%"PRIu64" batchPerTblTimes=%ud batchPerTbl = %ud\n",
            pThreadInfo->threadID, __func__, __LINE__,
            i, batchPerTblTimes, batchPerTbl);
@@ -5162,7 +5176,7 @@ static int64_t generateStbInterlaceData(
      startTime = taosGetTimestamp(pThreadInfo->time_precision);
  }
-  int64_t  k = generateStbDataTail(
+  int32_t k = generateStbDataTail(
            superTblInfo,
            batchPerTbl, pstr, *pRemainderBufLen, insertRows, 0,
            startTime,
@@ -5172,7 +5186,7 @@ static int64_t generateStbInterlaceData(
    pstr += dataLen;
    *pRemainderBufLen -= dataLen;
  } else {
-    debugPrint("%s() LN%d, generated data tail: %"PRIu64", not equal batch per table: %"PRIu64"\n",
+    debugPrint("%s() LN%d, generated data tail: %ud, not equal batch per table: %ud\n",
            __func__, __LINE__, k, batchPerTbl);
    pstr -= headLen;
    pstr[0] = '\0';
@@ -5183,7 +5197,7 @@ static int64_t generateStbInterlaceData(
 }
 static int64_t generateInterlaceDataWithoutStb(
-        char *tableName, uint64_t batchPerTbl,
+        char *tableName, uint32_t batchPerTbl,
        uint64_t tableSeq,
        char *dbName, char *buffer,
        int64_t insertRows,
@@ -5215,7 +5229,7 @@ static int64_t generateInterlaceDataWithoutStb(
    pstr += dataLen;
    *pRemainderBufLen -= dataLen;
  } else {
-    debugPrint("%s() LN%d, generated data tail: %"PRIu64", not equal batch per table: %"PRIu64"\n",
+    debugPrint("%s() LN%d, generated data tail: %"PRIu64", not equal batch per table: %ud\n",
            __func__, __LINE__, k, batchPerTbl);
    pstr -= headLen;
    pstr[0] = '\0';
@@ -5225,13 +5239,222 @@ static int64_t generateInterlaceDataWithoutStb(
  return k;
 }
-static int64_t generateStbProgressiveData(
+static int32_t prepareStbStmt(SSuperTable *stbInfo,
+        TAOS_STMT *stmt,
+        char *tableName, uint32_t batch, uint64_t insertRows,
+        uint64_t recordFrom,
+        int64_t startTime, char *buffer)
+{
+    uint32_t k;
+    int      ret;
+    char *pstr = buffer;
+    pstr += sprintf(pstr, "INSERT INTO %s values(?", tableName);
+    for (int i = 0; i < stbInfo->columnCount; i++) {
+        pstr += sprintf(pstr, ",?");
+    }
+    pstr += sprintf(pstr, ")");
+    ret = taos_stmt_prepare(stmt, buffer, 0);
+    if (ret != 0){
+        errorPrint("failed to execute taos_stmt_prepare. return 0x%x. reason: %s\n",
+                ret, taos_errstr(NULL));
+        return ret;
+    }
+    char *bindArray = malloc(sizeof(TAOS_BIND) * (stbInfo->columnCount + 1));
+    if (bindArray == NULL) {
+        errorPrint("Failed to allocate %d bind params\n", batch);
+        return -1;
+    }
+    bool tsRand;
+    if (0 == strncasecmp(stbInfo->dataSource, "rand", strlen("rand"))) {
+        tsRand = true;
+    } else {
+        tsRand = false;
+    }
+    for (k = 0; k < batch;) {
+        /* columnCount + 1 (ts) */
+        char data[MAX_DATA_SIZE];
+        memset(data, 0, MAX_DATA_SIZE);
+        char *ptr = data;
+        TAOS_BIND *bind = (TAOS_BIND *)(bindArray + 0);
+        int64_t *bind_ts;
+        bind_ts = (int64_t *)ptr;
+        bind->buffer_type = TSDB_DATA_TYPE_TIMESTAMP;
+        if (tsRand) {
+            *bind_ts = startTime + getTSRandTail(
+                    stbInfo->timeStampStep, k,
+                    stbInfo->disorderRatio,
+                    stbInfo->disorderRange);
+        } else {
+            *bind_ts = startTime + stbInfo->timeStampStep * k;
+        }
+        bind->buffer_length = sizeof(int64_t);
+        bind->buffer = bind_ts;
+        bind->length = &bind->buffer_length;
+        bind->is_null = NULL;
+        ptr += bind->buffer_length;
+        for (int i = 0; i < stbInfo->columnCount; i ++) {
+            bind = (TAOS_BIND *)((char *)bindArray + (sizeof(TAOS_BIND) * (i + 1)));
+            if (0 == strncasecmp(stbInfo->columns[i].dataType,
+                        "BINARY", strlen("BINARY"))) {
+                if (stbInfo->columns[i].dataLen > TSDB_MAX_BINARY_LEN) {
+                    errorPrint( "binary length overflow, max size:%u\n",
+                            (uint32_t)TSDB_MAX_BINARY_LEN);
+                    return -1;
+                }
+                char *bind_binary = (char *)ptr;
+                rand_string(bind_binary, stbInfo->columns[i].dataLen);
+                bind->buffer_type = TSDB_DATA_TYPE_BINARY;
+                bind->buffer_length = stbInfo->columns[i].dataLen;
+                bind->buffer = bind_binary;
+                bind->length = &bind->buffer_length;
+                bind->is_null = NULL;
+                ptr += bind->buffer_length;
+            } else if (0 == strncasecmp(stbInfo->columns[i].dataType,
+                        "NCHAR", strlen("NCHAR"))) {
+                if (stbInfo->columns[i].dataLen > TSDB_MAX_BINARY_LEN) {
+                    errorPrint( "nchar length overflow, max size:%u\n",
+                            (uint32_t)TSDB_MAX_BINARY_LEN);
+                    return -1;
+                }
+                char *bind_nchar = (char *)ptr;
+                rand_string(bind_nchar, stbInfo->columns[i].dataLen);
+                bind->buffer_type = TSDB_DATA_TYPE_NCHAR;
+                bind->buffer_length = strlen(bind_nchar);
+                bind->buffer = bind_nchar;
+                bind->length = &bind->buffer_length;
+                bind->is_null = NULL;
+                ptr += bind->buffer_length;
+            } else if (0 == strncasecmp(stbInfo->columns[i].dataType,
+                        "INT", strlen("INT"))) {
+                int32_t *bind_int = (int32_t *)ptr;
+                *bind_int = rand_int();
+                bind->buffer_type = TSDB_DATA_TYPE_INT;
+                bind->buffer_length = sizeof(int32_t);
+                bind->buffer = bind_int;
+                bind->length = &bind->buffer_length;
+                bind->is_null = NULL;
+                ptr += bind->buffer_length;
+            } else if (0 == strncasecmp(stbInfo->columns[i].dataType,
+                            "BIGINT", strlen("BIGINT"))) {
+                int64_t *bind_bigint = (int64_t *)ptr;
+                *bind_bigint = rand_bigint();
+                bind->buffer_type = TSDB_DATA_TYPE_BIGINT;
+                bind->buffer_length = sizeof(int64_t);
+                bind->buffer = bind_bigint;
+                bind->length = &bind->buffer_length;
+                bind->is_null = NULL;
+                ptr += bind->buffer_length;
+            }  else if (0 == strncasecmp(stbInfo->columns[i].dataType,
+                            "FLOAT", strlen("FLOAT"))) {
+                float   *bind_float = (float *)ptr;
+                *bind_float = rand_float();
+                bind->buffer_type = TSDB_DATA_TYPE_FLOAT;
+                bind->buffer_length = sizeof(float);
+                bind->buffer = bind_float;
+                bind->length = &bind->buffer_length;
+                bind->is_null = NULL;
+                ptr += bind->buffer_length;
+            }  else if (0 == strncasecmp(stbInfo->columns[i].dataType,
+                            "DOUBLE", strlen("DOUBLE"))) {
+                double  *bind_double = (double *)ptr;
+                *bind_double = rand_double();
+                bind->buffer_type = TSDB_DATA_TYPE_DOUBLE;
+                bind->buffer_length = sizeof(double);
+                bind->buffer = bind_double;
+                bind->length = &bind->buffer_length;
+                bind->is_null = NULL;
+                ptr += bind->buffer_length;
+            }  else if (0 == strncasecmp(stbInfo->columns[i].dataType,
+                            "SMALLINT", strlen("SMALLINT"))) {
+                int16_t *bind_smallint = (int16_t *)ptr;
+                *bind_smallint = rand_smallint();
+                bind->buffer_type = TSDB_DATA_TYPE_SMALLINT;
+                bind->buffer_length = sizeof(int16_t);
+                bind->buffer = bind_smallint;
+                bind->length = &bind->buffer_length;
+                bind->is_null = NULL;
+                ptr += bind->buffer_length;
+            }  else if (0 == strncasecmp(stbInfo->columns[i].dataType,
+                            "TINYINT", strlen("TINYINT"))) {
+                int8_t  *bind_tinyint = (int8_t *)ptr;
+                *bind_tinyint = rand_tinyint();
+                bind->buffer_type = TSDB_DATA_TYPE_TINYINT;
+                bind->buffer_length = sizeof(int8_t);
+                bind->buffer = bind_tinyint;
+                bind->length = &bind->buffer_length;
+                bind->is_null = NULL;
+                ptr += bind->buffer_length;
+            }  else if (0 == strncasecmp(stbInfo->columns[i].dataType,
+                            "BOOL", strlen("BOOL"))) {
+                int8_t  *bind_bool = (int8_t *)ptr;
+                *bind_bool = rand_bool();
+                bind->buffer_type = TSDB_DATA_TYPE_BOOL;
+                bind->buffer_length = sizeof(int8_t);
+                bind->buffer = bind_bool;
+                bind->length = &bind->buffer_length;
+                bind->is_null = NULL;
+                ptr += bind->buffer_length;
+            }  else if (0 == strncasecmp(stbInfo->columns[i].dataType,
+                            "TIMESTAMP", strlen("TIMESTAMP"))) {
+                int64_t *bind_ts2 = (int64_t *)ptr;
+                *bind_ts2 = rand_bigint();
+                bind->buffer_type = TSDB_DATA_TYPE_TIMESTAMP;
+                bind->buffer_length = sizeof(int64_t);
+                bind->buffer = bind_ts2;
+                bind->length = &bind->buffer_length;
+                bind->is_null = NULL;
+                ptr += bind->buffer_length;
+            }  else {
+                    errorPrint( "No support data type: %s\n",
+                            stbInfo->columns[i].dataType);
+                    return -1;
+            }
+        }
+        taos_stmt_bind_param(stmt, (TAOS_BIND *)bindArray);
+        // if msg > 3MB, break
+        taos_stmt_add_batch(stmt);
+        k++;
+        recordFrom ++;
+        if (recordFrom >= insertRows) {
+            break;
+        }
+    }
+    return k;
+}
+static int32_t generateStbProgressiveData(
        SSuperTable *superTblInfo,
        char *tableName,
        int64_t tableSeq,
        char *dbName, char *buffer,
        int64_t insertRows,
-        uint64_t startFrom, int64_t startTime, int64_t *pSamplePos,
+        uint64_t recordFrom, int64_t startTime, int64_t *pSamplePos,
        int64_t *pRemainderBufLen)
 {
  assert(buffer != NULL);
@@ -5254,17 +5477,22 @@ static int64_t generateStbProgressiveData(
  return generateStbDataTail(superTblInfo,
          g_args.num_of_RPR, pstr, *pRemainderBufLen,
-          insertRows, startFrom,
+          insertRows, recordFrom,
          startTime,
          pSamplePos, &dataLen);
 }
+static int64_t prepareStmtWithoutStb(char *tableName)
+{
+    return -1;
+}
 static int64_t generateProgressiveDataWithoutStb(
        char *tableName,
-        int64_t tableSeq,
+        /* int64_t tableSeq, */
        threadInfo *pThreadInfo, char *buffer,
        int64_t insertRows,
-        uint64_t startFrom, int64_t startTime, int64_t *pSamplePos,
+        uint64_t recordFrom, int64_t startTime, /*int64_t *pSamplePos, */
        int64_t *pRemainderBufLen)
 {
  assert(buffer != NULL);
@@ -5285,7 +5513,7 @@ static int64_t generateProgressiveDataWithoutStb(
  int64_t dataLen;
  return generateDataTailWithoutStb(
-          g_args.num_of_RPR, pstr, *pRemainderBufLen, insertRows, startFrom,
+          g_args.num_of_RPR, pstr, *pRemainderBufLen, insertRows, recordFrom,
          startTime,
          /*pSamplePos, */&dataLen);
 }
@@ -5305,7 +5533,7 @@ static void* syncWriteInterlace(threadInfo *pThreadInfo) {
         pThreadInfo->threadID, __func__, __LINE__);
  int64_t insertRows;
-  uint64_t interlaceRows;
+  uint32_t interlaceRows;
  uint64_t maxSqlLen;
  int64_t nTimeStampStep;
  uint64_t insert_interval;
@@ -5343,8 +5571,8 @@ static void* syncWriteInterlace(threadInfo *pThreadInfo) {
  if (interlaceRows > g_args.num_of_RPR)
    interlaceRows = g_args.num_of_RPR;
-  uint64_t batchPerTbl = interlaceRows;
+  uint32_t batchPerTbl = interlaceRows;
-  uint64_t batchPerTblTimes;
+  uint32_t batchPerTblTimes;
  if ((interlaceRows > 0) && (pThreadInfo->ntables > 1)) {
    batchPerTblTimes =
@@ -5393,9 +5621,9 @@ static void* syncWriteInterlace(threadInfo *pThreadInfo) {
    pstr += len;
    remainderBufLen -= len;
-    uint64_t recOfBatch = 0;
+    uint32_t recOfBatch = 0;
-    for (uint64_t i = 0; i < batchPerTblTimes; i ++) {
+    for (uint32_t i = 0; i < batchPerTblTimes; i ++) {
        char tableName[TSDB_TABLE_NAME_LEN];
      getTableName(tableName, pThreadInfo, tableSeq);
@@ -5408,11 +5636,12 @@ static void* syncWriteInterlace(threadInfo *pThreadInfo) {
      uint64_t oldRemainderLen = remainderBufLen;
-      int64_t generated;
+      int32_t generated;
      if (superTblInfo) {
        generated = generateStbInterlaceData(
                superTblInfo,
-                tableName, batchPerTbl, i, batchPerTblTimes,
+                tableName, batchPerTbl, i,
+                batchPerTblTimes,
                tableSeq,
                pThreadInfo, pstr,
                insertRows,
@@ -5427,10 +5656,10 @@ static void* syncWriteInterlace(threadInfo *pThreadInfo) {
                &remainderBufLen);
      }
-      debugPrint("[%d] %s() LN%d, generated records is %"PRId64"\n",
+      debugPrint("[%d] %s() LN%d, generated records is %d\n",
                  pThreadInfo->threadID, __func__, __LINE__, generated);
      if (generated < 0) {
-        errorPrint("[%d] %s() LN%d, generated records is %"PRId64"\n",
+        errorPrint("[%d] %s() LN%d, generated records is %d\n",
                  pThreadInfo->threadID, __func__, __LINE__, generated);
        goto free_of_interlace;
      } else if (generated == 0) {
@@ -5442,7 +5671,7 @@ static void* syncWriteInterlace(threadInfo *pThreadInfo) {
      pstr += (oldRemainderLen - remainderBufLen);
 //      startTime += batchPerTbl * superTblInfo->timeStampStep;
      pThreadInfo->totalInsertRows += batchPerTbl;
-      verbosePrint("[%d] %s() LN%d batchPerTbl=%"PRId64" recOfBatch=%"PRId64"\n",
+      verbosePrint("[%d] %s() LN%d batchPerTbl=%d recOfBatch=%d\n",
                pThreadInfo->threadID, __func__, __LINE__,
                batchPerTbl, recOfBatch);
@@ -5458,7 +5687,7 @@ static void* syncWriteInterlace(threadInfo *pThreadInfo) {
            if (generatedRecPerTbl >= insertRows)
              break;
-            int remainRows = insertRows - generatedRecPerTbl;
+            int64_t remainRows = insertRows - generatedRecPerTbl;
            if ((remainRows > 0) && (batchPerTbl > remainRows))
              batchPerTbl = remainRows;
@@ -5474,7 +5703,7 @@ static void* syncWriteInterlace(threadInfo *pThreadInfo) {
        break;
    }
-    verbosePrint("[%d] %s() LN%d recOfBatch=%"PRIu64" totalInsertRows=%"PRIu64"\n",
+    verbosePrint("[%d] %s() LN%d recOfBatch=%d totalInsertRows=%"PRIu64"\n",
              pThreadInfo->threadID, __func__, __LINE__, recOfBatch,
              pThreadInfo->totalInsertRows);
    verbosePrint("[%d] %s() LN%d, buffer=%s\n",
@@ -5483,7 +5712,7 @@ static void* syncWriteInterlace(threadInfo *pThreadInfo) {
    startTs = taosGetTimestampMs();
    if (recOfBatch == 0) {
-      errorPrint("[%d] %s() LN%d try inserting records of batch is %"PRIu64"\n",
+      errorPrint("[%d] %s() LN%d try inserting records of batch is %d\n",
              pThreadInfo->threadID, __func__, __LINE__,
              recOfBatch);
      errorPrint("%s\n", "\tPlease check if the batch or the buffer length is proper value!\n");
@@ -5505,7 +5734,7 @@ static void* syncWriteInterlace(threadInfo *pThreadInfo) {
    pThreadInfo->totalDelay += delay;
    if (recOfBatch != affectedRows) {
-        errorPrint("[%d] %s() LN%d execInsert insert %"PRIu64", affected rows: %"PRId64"\n%s\n",
+        errorPrint("[%d] %s() LN%d execInsert insert %d, affected rows: %"PRId64"\n%s\n",
                pThreadInfo->threadID, __func__, __LINE__,
                recOfBatch, affectedRows, pThreadInfo->buffer);
        goto free_of_interlace;
@@ -5566,12 +5795,6 @@ static void* syncWriteProgressive(threadInfo *pThreadInfo) {
  uint64_t startTs = taosGetTimestampMs();
  uint64_t endTs;
-/*  int insert_interval =
-      superTblInfo?superTblInfo->insertInterval:g_args.insert_interval;
-  uint64_t st = 0;
-  uint64_t et = 0xffffffff;
-  */
  pThreadInfo->totalInsertRows = 0;
  pThreadInfo->totalAffectedRows = 0;
@@ -5598,20 +5821,33 @@ static void* syncWriteProgressive(threadInfo *pThreadInfo) {
      pstr += len;
      remainderBufLen -= len;
-      int64_t generated;
+      int32_t generated;
      if (superTblInfo) {
-        generated = generateStbProgressiveData(
+          if (superTblInfo->iface == STMT_IFACE) {
-                superTblInfo,
+              generated = prepareStbStmt(superTblInfo,
-              tableName, tableSeq, pThreadInfo->db_name, pstr, insertRows,
+                      pThreadInfo->stmt,
-            i, start_time,
+                      tableName, g_args.num_of_RPR,
-            &(pThreadInfo->samplePos),
+                      insertRows, i, start_time, pstr);
-            &remainderBufLen);
+          } else {
+              generated = generateStbProgressiveData(
+                      superTblInfo,
+                      tableName, tableSeq, pThreadInfo->db_name, pstr,
+                      insertRows, i, start_time,
+                      &(pThreadInfo->samplePos),
+                      &remainderBufLen);
+          }
      } else {
-        generated = generateProgressiveDataWithoutStb(
+          if (g_args.iface == STMT_IFACE) {
-              tableName, tableSeq, pThreadInfo, pstr, insertRows,
+              generated = prepareStmtWithoutStb(tableName);
-            i, start_time,
+          } else {
-            &(pThreadInfo->samplePos),
+              generated = generateProgressiveDataWithoutStb(
-            &remainderBufLen);
+                      tableName,
+                      /*  tableSeq, */
+                      pThreadInfo, pstr, insertRows,
+                      i, start_time,
+                      /* &(pThreadInfo->samplePos), */
+                      &remainderBufLen);
+          }
      }
      if (generated > 0)
        i += generated;
@@ -5679,7 +5915,7 @@ static void* syncWrite(void *sarg) {
  threadInfo *pThreadInfo = (threadInfo *)sarg;
  SSuperTable* superTblInfo = pThreadInfo->superTblInfo;
-  int interlaceRows;
+  uint32_t interlaceRows;
  if (superTblInfo) {
    if ((superTblInfo->interlaceRows == 0)
@@ -5810,7 +6046,7 @@ static void startMultiThreadInsertData(int threads, char* db_name,
        char* precision,SSuperTable* superTblInfo) {
  //TAOS* taos;
-  //if (0 == strncasecmp(superTblInfo->insertMode, "taosc", 5)) {
+  //if (0 == strncasecmp(superTblInfo->iface, "taosc", 5)) {
  //  taos = taos_connect(g_Dbs.host, g_Dbs.user, g_Dbs.password, db_name, g_Dbs.port);
  //  if (NULL == taos) {
  //    printf("connect to server fail, reason: %s\n", taos_errstr(NULL));
@@ -5879,7 +6115,7 @@ static void startMultiThreadInsertData(int threads, char* db_name,
  }
  int64_t ntables = 0;
-  uint64_t startFrom;
+  uint64_t tableFrom;
  if (superTblInfo) {
    int64_t limit;
@@ -5906,7 +6142,7 @@ static void startMultiThreadInsertData(int threads, char* db_name,
    }
    ntables = limit;
-    startFrom = offset;
+    tableFrom = offset;
    if ((superTblInfo->childTblExists != TBL_NO_EXISTS)
        && ((superTblInfo->childTblOffset + superTblInfo->childTblLimit )
@@ -5938,7 +6174,7 @@ static void startMultiThreadInsertData(int threads, char* db_name,
        offset);
  } else {
    ntables = g_args.num_of_tables;
-    startFrom = 0;
+    tableFrom = 0;
  }
  taos_close(taos0);
@@ -5955,8 +6191,9 @@ static void startMultiThreadInsertData(int threads, char* db_name,
  }
  if ((superTblInfo)
-      && (superTblInfo->insertMode == REST_IFACE)) {
+      && (superTblInfo->iface == REST_IFACE)) {
-      if (convertHostToServAddr(g_Dbs.host, g_Dbs.port, &(g_Dbs.serv_addr)) != 0) {
+      if (convertHostToServAddr(
+                  g_Dbs.host, g_Dbs.port, &(g_Dbs.serv_addr)) != 0) {
        exit(-1);
      }
  }
@@ -5971,22 +6208,22 @@ static void startMultiThreadInsertData(int threads, char* db_name,
  memset(infos, 0, threads * sizeof(threadInfo));
  for (int i = 0; i < threads; i++) {
-    threadInfo *t_info = infos + i;
+    threadInfo *pThreadInfo = infos + i;
-    t_info->threadID = i;
+    pThreadInfo->threadID = i;
-    tstrncpy(t_info->db_name, db_name, MAX_DB_NAME_SIZE);
+    tstrncpy(pThreadInfo->db_name, db_name, MAX_DB_NAME_SIZE);
-    t_info->time_precision = timePrec;
+    pThreadInfo->time_precision = timePrec;
-    t_info->superTblInfo = superTblInfo;
+    pThreadInfo->superTblInfo = superTblInfo;
-    t_info->start_time = start_time;
+    pThreadInfo->start_time = start_time;
-    t_info->minDelay = UINT64_MAX;
+    pThreadInfo->minDelay = UINT64_MAX;
    if ((NULL == superTblInfo) ||
-            (superTblInfo->insertMode != REST_IFACE)) {
+            (superTblInfo->iface != REST_IFACE)) {
      //t_info->taos = taos;
-      t_info->taos = taos_connect(
+      pThreadInfo->taos = taos_connect(
              g_Dbs.host, g_Dbs.user,
              g_Dbs.password, db_name, g_Dbs.port);
-      if (NULL == t_info->taos) {
+      if (NULL == pThreadInfo->taos) {
        errorPrint(
                "%s() LN%d, connect to server fail from insert sub thread, reason: %s\n",
                __func__, __LINE__,
@@ -5995,9 +6232,9 @@ static void startMultiThreadInsertData(int threads, char* db_name,
        exit(-1);
      }
-      if ((superTblInfo) && (superTblInfo->insertMode == STMT_IFACE)) {
+      if ((superTblInfo) && (superTblInfo->iface == STMT_IFACE)) {
-        t_info->stmt = taos_stmt_init(t_info->taos);
+        pThreadInfo->stmt = taos_stmt_init(pThreadInfo->taos);
-        if (NULL == t_info->stmt) {
+        if (NULL == pThreadInfo->stmt) {
            errorPrint(
                "%s() LN%d, failed init stmt, reason: %s\n",
                __func__, __LINE__,
@@ -6008,27 +6245,27 @@ static void startMultiThreadInsertData(int threads, char* db_name,
        }
      }
    } else {
-      t_info->taos = NULL;
+      pThreadInfo->taos = NULL;
    }
 /*    if ((NULL == superTblInfo)
            || (0 == superTblInfo->multiThreadWriteOneTbl)) {
            */
-      t_info->start_table_from = startFrom;
+      pThreadInfo->start_table_from = tableFrom;
-      t_info->ntables = i<b?a+1:a;
+      pThreadInfo->ntables = i<b?a+1:a;
-      t_info->end_table_to = i < b ? startFrom + a : startFrom + a - 1;
+      pThreadInfo->end_table_to = i < b ? tableFrom + a : tableFrom + a - 1;
-      startFrom = t_info->end_table_to + 1;
+      tableFrom = pThreadInfo->end_table_to + 1;
 /*    } else {
-      t_info->start_table_from = 0;
+      pThreadInfo->start_table_from = 0;
-      t_info->ntables = superTblInfo->childTblCount;
+      pThreadInfo->ntables = superTblInfo->childTblCount;
-      t_info->start_time = t_info->start_time + rand_int() % 10000 - rand_tinyint();
+      pThreadInfo->start_time = pThreadInfo->start_time + rand_int() % 10000 - rand_tinyint();
    }
 */
-    tsem_init(&(t_info->lock_sem), 0, 0);
+    tsem_init(&(pThreadInfo->lock_sem), 0, 0);
    if (ASYNC_MODE == g_Dbs.asyncMode) {
-      pthread_create(pids + i, NULL, asyncWrite, t_info);
+      pthread_create(pids + i, NULL, asyncWrite, pThreadInfo);
    } else {
-      pthread_create(pids + i, NULL, syncWrite, t_info);
+      pthread_create(pids + i, NULL, syncWrite, pThreadInfo);
    }
  }
@@ -6043,31 +6280,32 @@ static void startMultiThreadInsertData(int threads, char* db_name,
  double  avgDelay = 0;
  for (int i = 0; i < threads; i++) {
-    threadInfo *t_info = infos + i;
+    threadInfo *pThreadInfo = infos + i;
-    tsem_destroy(&(t_info->lock_sem));
+    tsem_destroy(&(pThreadInfo->lock_sem));
-    if (t_info->stmt) {
+    if (pThreadInfo->stmt) {
-      taos_stmt_close(t_info->stmt);
+      taos_stmt_close(pThreadInfo->stmt);
    }
-    taos_close(t_info->taos);
+    tsem_destroy(&(pThreadInfo->lock_sem));
+    taos_close(pThreadInfo->taos);
    debugPrint("%s() LN%d, [%d] totalInsert=%"PRIu64" totalAffected=%"PRIu64"\n",
            __func__, __LINE__,
-            t_info->threadID, t_info->totalInsertRows,
+            pThreadInfo->threadID, pThreadInfo->totalInsertRows,
-            t_info->totalAffectedRows);
+            pThreadInfo->totalAffectedRows);
    if (superTblInfo) {
-        superTblInfo->totalAffectedRows += t_info->totalAffectedRows;
+        superTblInfo->totalAffectedRows += pThreadInfo->totalAffectedRows;
-        superTblInfo->totalInsertRows += t_info->totalInsertRows;
+        superTblInfo->totalInsertRows += pThreadInfo->totalInsertRows;
    } else {
-        g_args.totalAffectedRows += t_info->totalAffectedRows;
+        g_args.totalAffectedRows += pThreadInfo->totalAffectedRows;
-        g_args.totalInsertRows += t_info->totalInsertRows;
+        g_args.totalInsertRows += pThreadInfo->totalInsertRows;
    }
-    totalDelay  += t_info->totalDelay;
+    totalDelay  += pThreadInfo->totalDelay;
-    cntDelay   += t_info->cntDelay;
+    cntDelay   += pThreadInfo->cntDelay;
-    if (t_info->maxDelay > maxDelay) maxDelay = t_info->maxDelay;
+    if (pThreadInfo->maxDelay > maxDelay) maxDelay = pThreadInfo->maxDelay;
-    if (t_info->minDelay < minDelay) minDelay = t_info->minDelay;
+    if (pThreadInfo->minDelay < minDelay) minDelay = pThreadInfo->minDelay;
  }
  cntDelay -= 1;
@@ -6123,26 +6361,26 @@ static void startMultiThreadInsertData(int threads, char* db_name,
 static void *readTable(void *sarg) {
 #if 1
-  threadInfo *rinfo = (threadInfo *)sarg;
+  threadInfo *pThreadInfo = (threadInfo *)sarg;
-  TAOS *taos = rinfo->taos;
+  TAOS *taos = pThreadInfo->taos;
  char command[BUFFER_SIZE] = "\0";
-  uint64_t sTime = rinfo->start_time;
+  uint64_t sTime = pThreadInfo->start_time;
-  char *tb_prefix = rinfo->tb_prefix;
+  char *tb_prefix = pThreadInfo->tb_prefix;
-  FILE *fp = fopen(rinfo->fp, "a");
+  FILE *fp = fopen(pThreadInfo->filePath, "a");
  if (NULL == fp) {
-    errorPrint( "fopen %s fail, reason:%s.\n", rinfo->fp, strerror(errno));
+    errorPrint( "fopen %s fail, reason:%s.\n", pThreadInfo->filePath, strerror(errno));
    return NULL;
  }
  int64_t num_of_DPT;
-/*  if (rinfo->superTblInfo) {
+/*  if (pThreadInfo->superTblInfo) {
-    num_of_DPT = rinfo->superTblInfo->insertRows; //  nrecords_per_table;
+    num_of_DPT = pThreadInfo->superTblInfo->insertRows; //  nrecords_per_table;
  } else {
  */
      num_of_DPT = g_args.num_of_DPT;
 //  }
-  int64_t num_of_tables = rinfo->ntables; // rinfo->end_table_to - rinfo->start_table_from + 1;
+  int64_t num_of_tables = pThreadInfo->ntables; // rinfo->end_table_to - rinfo->start_table_from + 1;
  int64_t totalData = num_of_DPT * num_of_tables;
  bool do_aggreFunc = g_Dbs.do_aggreFunc;
@@ -6195,17 +6433,17 @@ static void *readTable(void *sarg) {
 static void *readMetric(void *sarg) {
 #if 1
-  threadInfo *rinfo = (threadInfo *)sarg;
+  threadInfo *pThreadInfo = (threadInfo *)sarg;
-  TAOS *taos = rinfo->taos;
+  TAOS *taos = pThreadInfo->taos;
  char command[BUFFER_SIZE] = "\0";
-  FILE *fp = fopen(rinfo->fp, "a");
+  FILE *fp = fopen(pThreadInfo->filePath, "a");
  if (NULL == fp) {
-    printf("fopen %s fail, reason:%s.\n", rinfo->fp, strerror(errno));
+    printf("fopen %s fail, reason:%s.\n", pThreadInfo->filePath, strerror(errno));
    return NULL;
  }
-  int64_t num_of_DPT = rinfo->superTblInfo->insertRows;
+  int64_t num_of_DPT = pThreadInfo->superTblInfo->insertRows;
-  int64_t num_of_tables = rinfo->ntables; // rinfo->end_table_to - rinfo->start_table_from + 1;
+  int64_t num_of_tables = pThreadInfo->ntables; // rinfo->end_table_to - rinfo->start_table_from + 1;
  int64_t totalData = num_of_DPT * num_of_tables;
  bool do_aggreFunc = g_Dbs.do_aggreFunc;
@@ -6404,8 +6642,8 @@ static void *specifiedTableQuery(void *sarg) {
  uint64_t lastPrintTime = taosGetTimestampMs();
  uint64_t startTs = taosGetTimestampMs();
-  if (g_queryInfo.specifiedQueryInfo.result[pThreadInfo->querySeq][0] != 0) {
+  if (g_queryInfo.specifiedQueryInfo.result[pThreadInfo->querySeq] != NULL) {
-        sprintf(pThreadInfo->fp, "%s-%d",
+    sprintf(pThreadInfo->filePath, "%s-%d",
                g_queryInfo.specifiedQueryInfo.result[pThreadInfo->querySeq],
                pThreadInfo->threadID);
  }
@@ -6505,8 +6743,8 @@ static void *superTableQuery(void *sarg) {
      for (int j = 0; j < g_queryInfo.superQueryInfo.sqlCount; j++) {
        memset(sqlstr,0,sizeof(sqlstr));
        replaceChildTblName(g_queryInfo.superQueryInfo.sql[j], sqlstr, i);
-        if (g_queryInfo.superQueryInfo.result[j][0] != 0) {
+        if (g_queryInfo.superQueryInfo.result[j] != NULL) {
-          sprintf(pThreadInfo->fp, "%s-%d",
+          sprintf(pThreadInfo->filePath, "%s-%d",
                  g_queryInfo.superQueryInfo.result[j],
                  pThreadInfo->threadID);
        }
@@ -6596,15 +6834,14 @@ static int queryTestProcess() {
    for (uint64_t i = 0; i < nSqlCount; i++) {
        for (int j = 0; j < nConcurrent; j++) {
            uint64_t seq = i * nConcurrent + j;
-            threadInfo *t_info = infos + seq;
+            threadInfo *pThreadInfo = infos + seq;
-            t_info->threadID = seq;
+            pThreadInfo->threadID = seq;
-            t_info->querySeq = i;
+            pThreadInfo->querySeq = i;
            if (0 == strncasecmp(g_queryInfo.queryMode, "taosc", 5)) {
                char sqlStr[MAX_TB_NAME_SIZE*2];
                sprintf(sqlStr, "use %s", g_queryInfo.dbName);
-                verbosePrint("%s() %d sqlStr: %s\n", __func__, __LINE__, sqlStr);
                if (0 != queryDbExec(taos, sqlStr, NO_INSERT_TYPE, false)) {
                    taos_close(taos);
                    free(infos);
@@ -6615,10 +6852,10 @@ static int queryTestProcess() {
                }
            }
-            t_info->taos = NULL;// TODO: workaround to use separate taos connection;
+            pThreadInfo->taos = NULL;// TODO: workaround to use separate taos connection;
            pthread_create(pids + seq, NULL, specifiedTableQuery,
-                t_info);
+                pThreadInfo);
        }
    }
  } else {
@@ -6656,17 +6893,17 @@ static int queryTestProcess() {
      b = ntables % threads;
    }
-    uint64_t startFrom = 0;
+    uint64_t tableFrom = 0;
    for (int i = 0; i < threads; i++) {
-      threadInfo *t_info = infosOfSub + i;
+      threadInfo *pThreadInfo = infosOfSub + i;
-      t_info->threadID = i;
+      pThreadInfo->threadID = i;
-      t_info->start_table_from = startFrom;
+      pThreadInfo->start_table_from = tableFrom;
-      t_info->ntables = i<b?a+1:a;
+      pThreadInfo->ntables = i<b?a+1:a;
-      t_info->end_table_to = i < b ? startFrom + a : startFrom + a - 1;
+      pThreadInfo->end_table_to = i < b ? tableFrom + a : tableFrom + a - 1;
-      startFrom = t_info->end_table_to + 1;
+      tableFrom = pThreadInfo->end_table_to + 1;
-      t_info->taos = NULL; // TODO: workaround to use separate taos connection;
+      pThreadInfo->taos = NULL; // TODO: workaround to use separate taos connection;
-      pthread_create(pidsOfSub + i, NULL, superTableQuery, t_info);
+      pthread_create(pidsOfSub + i, NULL, superTableQuery, pThreadInfo);
    }
    g_queryInfo.superQueryInfo.threadCnt = threads;
@@ -6713,7 +6950,7 @@ static void stable_sub_callback(
  }
  if (param)
-    appendResultToFile(res, ((threadInfo *)param)->fp);
+    fetchResult(res, (threadInfo *)param);
  // tao_unscribe() will free result.
 }
@@ -6726,7 +6963,7 @@ static void specified_sub_callback(
  }
  if (param)
-    appendResultToFile(res, ((threadInfo *)param)->fp);
+    fetchResult(res, (threadInfo *)param);
  // tao_unscribe() will free result.
 }
@@ -6779,28 +7016,16 @@ static void *superSubscribe(void *sarg) {
      exit(-1);
  }
-  if (g_queryInfo.superQueryInfo.sqlCount * pThreadInfo->ntables > MAX_QUERY_SQL_COUNT) {
-      errorPrint("The number %"PRId64" of sql count(%"PRIu64") multiple the table number(%"PRId64") of the thread is more than max query sql count: %d\n",
-              g_queryInfo.superQueryInfo.sqlCount * pThreadInfo->ntables,
-              g_queryInfo.superQueryInfo.sqlCount,
-              pThreadInfo->ntables,
-              MAX_QUERY_SQL_COUNT);
-      exit(-1);
-  }
  if (pThreadInfo->taos == NULL) {
-    TAOS * taos = NULL;
+    pThreadInfo->taos = taos_connect(g_queryInfo.host,
-    taos = taos_connect(g_queryInfo.host,
          g_queryInfo.user,
          g_queryInfo.password,
          g_queryInfo.dbName,
          g_queryInfo.port);
-    if (taos == NULL) {
+    if (pThreadInfo->taos == NULL) {
      errorPrint("[%d] Failed to connect to TDengine, reason:%s\n",
            pThreadInfo->threadID, taos_errstr(NULL));
      return NULL;
-    } else {
-      pThreadInfo->taos = taos;
    }
  }
@@ -6830,7 +7055,7 @@ static void *superSubscribe(void *sarg) {
              g_queryInfo.superQueryInfo.sql[pThreadInfo->querySeq],
              subSqlstr, i);
      if (g_queryInfo.superQueryInfo.result[pThreadInfo->querySeq][0] != 0) {
-        sprintf(pThreadInfo->fp, "%s-%d",
+        sprintf(pThreadInfo->filePath, "%s-%d",
                g_queryInfo.superQueryInfo.result[pThreadInfo->querySeq],
                pThreadInfo->threadID);
      }
@@ -6855,6 +7080,8 @@ static void *superSubscribe(void *sarg) {
  }
  TAOS_RES* res = NULL;
+  uint64_t st = 0, et = 0;
  while(1) {
    for (uint64_t i = pThreadInfo->start_table_from;
            i <= pThreadInfo->end_table_to; i++) {
@@ -6863,25 +7090,30 @@ static void *superSubscribe(void *sarg) {
          continue;
      }
+      st = taosGetTimestampMs();
+      performancePrint("st: %"PRIu64" et: %"PRIu64" st-et: %"PRIu64"\n", st, et, (st - et));
      res = taos_consume(tsub[tsubSeq]);
+      et = taosGetTimestampMs();
+      performancePrint("st: %"PRIu64" et: %"PRIu64" delta: %"PRIu64"\n", st, et, (et - st));
      if (res) {
          if (g_queryInfo.superQueryInfo.result[pThreadInfo->querySeq][0] != 0) {
-              sprintf(pThreadInfo->fp, "%s-%d",
+              sprintf(pThreadInfo->filePath, "%s-%d",
                      g_queryInfo.superQueryInfo.result[pThreadInfo->querySeq],
                      pThreadInfo->threadID);
-              appendResultToFile(res, pThreadInfo->fp);
+              fetchResult(res, pThreadInfo);
          }
          if (g_queryInfo.superQueryInfo.result[pThreadInfo->querySeq][0] != 0) {
-              sprintf(pThreadInfo->fp, "%s-%d",
+              sprintf(pThreadInfo->filePath, "%s-%d",
                      g_queryInfo.superQueryInfo.result[pThreadInfo->querySeq],
                      pThreadInfo->threadID);
-              appendResultToFile(res, pThreadInfo->fp);
+              fetchResult(res, pThreadInfo);
          }
          consumed[tsubSeq] ++;
          if ((g_queryInfo.superQueryInfo.subscribeKeepProgress)
                  && (consumed[tsubSeq] >=
-                      g_queryInfo.superQueryInfo.resubAfterConsume[pThreadInfo->querySeq])) {
+                      g_queryInfo.superQueryInfo.resubAfterConsume)) {
              printf("keepProgress:%d, resub super table query: %"PRIu64"\n",
                      g_queryInfo.superQueryInfo.subscribeKeepProgress,
                      pThreadInfo->querySeq);
@@ -6916,95 +7148,92 @@ static void *superSubscribe(void *sarg) {
 static void *specifiedSubscribe(void *sarg) {
  threadInfo *pThreadInfo = (threadInfo *)sarg;
-  TAOS_SUB*  tsub = NULL;
+//  TAOS_SUB*  tsub = NULL;
  if (pThreadInfo->taos == NULL) {
-    TAOS * taos = NULL;
+    pThreadInfo->taos = taos_connect(g_queryInfo.host,
-    taos = taos_connect(g_queryInfo.host,
          g_queryInfo.user,
          g_queryInfo.password,
          g_queryInfo.dbName,
          g_queryInfo.port);
-    if (taos == NULL) {
+    if (pThreadInfo->taos == NULL) {
      errorPrint("[%d] Failed to connect to TDengine, reason:%s\n",
            pThreadInfo->threadID, taos_errstr(NULL));
      return NULL;
-    } else {
-      pThreadInfo->taos = taos;
    }
  }
  char sqlStr[MAX_TB_NAME_SIZE*2];
  sprintf(sqlStr, "use %s", g_queryInfo.dbName);
-  debugPrint("%s() %d sqlStr: %s\n", __func__, __LINE__, sqlStr);
  if (0 != queryDbExec(pThreadInfo->taos, sqlStr, NO_INSERT_TYPE, false)) {
    taos_close(pThreadInfo->taos);
    return NULL;
  }
-  char topic[32] = {0};
+  sprintf(g_queryInfo.specifiedQueryInfo.topic[pThreadInfo->threadID],
-  sprintf(topic, "taosdemo-subscribe-%"PRIu64"", pThreadInfo->querySeq);
+          "taosdemo-subscribe-%"PRIu64"-%d",
-  if (g_queryInfo.specifiedQueryInfo.result[pThreadInfo->querySeq][0] != 0) {
+          pThreadInfo->querySeq,
-      sprintf(pThreadInfo->fp, "%s-%d",
+          pThreadInfo->threadID);
+  if (g_queryInfo.specifiedQueryInfo.result[pThreadInfo->querySeq] != NULL) {
+      sprintf(pThreadInfo->filePath, "%s-%d",
                g_queryInfo.specifiedQueryInfo.result[pThreadInfo->querySeq],
                pThreadInfo->threadID);
  }
-  tsub = subscribeImpl(
+  g_queryInfo.specifiedQueryInfo.tsub[pThreadInfo->threadID] = subscribeImpl(
-                      SPECIFIED_CLASS, pThreadInfo,
+          SPECIFIED_CLASS, pThreadInfo,
          g_queryInfo.specifiedQueryInfo.sql[pThreadInfo->querySeq],
-          topic,
+          g_queryInfo.specifiedQueryInfo.topic[pThreadInfo->threadID],
          g_queryInfo.specifiedQueryInfo.subscribeRestart,
          g_queryInfo.specifiedQueryInfo.subscribeInterval);
-  if (NULL == tsub) {
+  if (NULL == g_queryInfo.specifiedQueryInfo.tsub[pThreadInfo->threadID]) {
      taos_close(pThreadInfo->taos);
      return NULL;
  }
  // start loop to consume result
-  TAOS_RES* res = NULL;
-  int consumed;
+  g_queryInfo.specifiedQueryInfo.consumed[pThreadInfo->threadID] = 0;
  while(1) {
      if (ASYNC_MODE == g_queryInfo.specifiedQueryInfo.asyncMode) {
        continue;
      }
-      res = taos_consume(tsub);
+      g_queryInfo.specifiedQueryInfo.res[pThreadInfo->threadID] = taos_consume(
-      if (res) {
+              g_queryInfo.specifiedQueryInfo.tsub[pThreadInfo->threadID]);
+      if (g_queryInfo.specifiedQueryInfo.res[pThreadInfo->threadID]) {
          if (g_queryInfo.specifiedQueryInfo.result[pThreadInfo->querySeq][0] != 0) {
-              sprintf(pThreadInfo->fp, "%s-%d",
+              sprintf(pThreadInfo->filePath, "%s-%d",
                      g_queryInfo.specifiedQueryInfo.result[pThreadInfo->querySeq],
                      pThreadInfo->threadID);
-              appendResultToFile(res, pThreadInfo->fp);
+              fetchResult(g_queryInfo.specifiedQueryInfo.res[pThreadInfo->threadID], pThreadInfo);
          }
-          consumed ++;
+          g_queryInfo.specifiedQueryInfo.consumed[pThreadInfo->threadID] ++;
          if ((g_queryInfo.specifiedQueryInfo.subscribeKeepProgress)
-                && (consumed >=
+                && (g_queryInfo.specifiedQueryInfo.consumed[pThreadInfo->threadID] >=
                    g_queryInfo.specifiedQueryInfo.resubAfterConsume[pThreadInfo->querySeq])) {
              printf("keepProgress:%d, resub specified query: %"PRIu64"\n",
                    g_queryInfo.specifiedQueryInfo.subscribeKeepProgress,
                    pThreadInfo->querySeq);
-              consumed = 0;
+              g_queryInfo.specifiedQueryInfo.consumed[pThreadInfo->threadID] = 0;
-              taos_unsubscribe(tsub,
+              taos_unsubscribe(g_queryInfo.specifiedQueryInfo.tsub[pThreadInfo->threadID],
                      g_queryInfo.specifiedQueryInfo.subscribeKeepProgress);
-              tsub = subscribeImpl(
+              g_queryInfo.specifiedQueryInfo.tsub[pThreadInfo->threadID] = subscribeImpl(
                      SPECIFIED_CLASS,
                      pThreadInfo,
                      g_queryInfo.specifiedQueryInfo.sql[pThreadInfo->querySeq],
-                      topic,
+                      g_queryInfo.specifiedQueryInfo.topic[pThreadInfo->threadID],
                      g_queryInfo.specifiedQueryInfo.subscribeRestart,
                      g_queryInfo.specifiedQueryInfo.subscribeInterval);
-              if (NULL == tsub) {
+              if (NULL == g_queryInfo.specifiedQueryInfo.tsub[pThreadInfo->threadID]) {
                taos_close(pThreadInfo->taos);
                return NULL;
              }
          }
      }
  }
-  taos_free_result(res);
+  taos_free_result(g_queryInfo.specifiedQueryInfo.res[pThreadInfo->threadID]);
-  taos_unsubscribe(tsub, 0);
+  taos_unsubscribe(g_queryInfo.specifiedQueryInfo.tsub[pThreadInfo->querySeq], 0);
  taos_close(pThreadInfo->taos);
  return NULL;
@@ -7074,18 +7303,18 @@ static int subscribeTestProcess() {
    for (int i = 0; i < g_queryInfo.specifiedQueryInfo.sqlCount; i++) {
        for (int j = 0; j < g_queryInfo.specifiedQueryInfo.concurrent; j++) {
            uint64_t seq = i * g_queryInfo.specifiedQueryInfo.concurrent + j;
-            threadInfo *t_info = infos + seq;
+            threadInfo *pThreadInfo = infos + seq;
-            t_info->threadID = seq;
+            pThreadInfo->threadID = seq;
-            t_info->querySeq = i;
+            pThreadInfo->querySeq = i;
-            t_info->taos = NULL;  // TODO: workaround to use separate taos connection;
+            pThreadInfo->taos = NULL;  // TODO: workaround to use separate taos connection;
-            pthread_create(pids + seq, NULL, specifiedSubscribe, t_info);
+            pthread_create(pids + seq, NULL, specifiedSubscribe, pThreadInfo);
        }
    }
  }
  //==== create threads for super table query
  if (g_queryInfo.superQueryInfo.sqlCount <= 0) {
-    printf("%s() LN%d, super table query sqlCount %"PRIu64".\n",
+    debugPrint("%s() LN%d, super table query sqlCount %"PRIu64".\n",
              __func__, __LINE__,
              g_queryInfo.superQueryInfo.sqlCount);
  } else {
@@ -7121,20 +7350,20 @@ static int subscribeTestProcess() {
        }
        for (uint64_t i = 0; i < g_queryInfo.superQueryInfo.sqlCount; i++) {
-            uint64_t startFrom = 0;
+            uint64_t tableFrom = 0;
            for (int j = 0; j < threads; j++) {
                uint64_t seq = i * threads + j;
-                threadInfo *t_info = infosOfStable + seq;
+                threadInfo *pThreadInfo = infosOfStable + seq;
-                t_info->threadID = seq;
+                pThreadInfo->threadID = seq;
-                t_info->querySeq = i;
+                pThreadInfo->querySeq = i;
-                t_info->start_table_from = startFrom;
+                pThreadInfo->start_table_from = tableFrom;
-                t_info->ntables = j<b?a+1:a;
+                pThreadInfo->ntables = j<b?a+1:a;
-                t_info->end_table_to = j<b?startFrom+a:startFrom+a-1;
+                pThreadInfo->end_table_to = j<b?tableFrom+a:tableFrom+a-1;
-                startFrom = t_info->end_table_to + 1;
+                tableFrom = pThreadInfo->end_table_to + 1;
-                t_info->taos = NULL; // TODO: workaround to use separate taos connection;
+                pThreadInfo->taos = NULL; // TODO: workaround to use separate taos connection;
                pthread_create(pidsOfStable + seq,
-                        NULL, superSubscribe, t_info);
+                        NULL, superSubscribe, pThreadInfo);
            }
        }
@@ -7250,7 +7479,7 @@ static void setParaFromArg(){
    tstrncpy(g_Dbs.db[0].superTbls[0].childTblPrefix,
            g_args.tb_prefix, MAX_TB_NAME_SIZE);
    tstrncpy(g_Dbs.db[0].superTbls[0].dataSource, "rand", MAX_TB_NAME_SIZE);
-    g_Dbs.db[0].superTbls[0].insertMode = g_args.iface;
+    g_Dbs.db[0].superTbls[0].iface = g_args.iface;
    tstrncpy(g_Dbs.db[0].superTbls[0].startTimestamp,
            "2017-07-14 10:40:00.000", MAX_TB_NAME_SIZE);
    g_Dbs.db[0].superTbls[0].timeStampStep = DEFAULT_TIMESTAMP_STEP;
@@ -7363,7 +7592,6 @@ static void querySqlFile(TAOS* taos, char* sqlFile)
    }
    memcpy(cmd + cmd_len, line, read_len);
-    verbosePrint("%s() LN%d cmd: %s\n", __func__, __LINE__, cmd);
    if (0 != queryDbExec(taos, cmd, NO_INSERT_TYPE, false)) {
        errorPrint("%s() LN%d, queryDbExec %s failed!\n",
               __func__, __LINE__, cmd);
@@ -7413,47 +7641,47 @@ static void queryResult() {
  // query data
  pthread_t read_id;
-  threadInfo *rInfo = malloc(sizeof(threadInfo));
+  threadInfo *pThreadInfo = malloc(sizeof(threadInfo));
-  assert(rInfo);
+  assert(pThreadInfo);
-  rInfo->start_time = 1500000000000;  // 2017-07-14 10:40:00.000
+  pThreadInfo->start_time = 1500000000000;  // 2017-07-14 10:40:00.000
-  rInfo->start_table_from = 0;
+  pThreadInfo->start_table_from = 0;
-  //rInfo->do_aggreFunc = g_Dbs.do_aggreFunc;
+  //pThreadInfo->do_aggreFunc = g_Dbs.do_aggreFunc;
  if (g_args.use_metric) {
-    rInfo->ntables = g_Dbs.db[0].superTbls[0].childTblCount;
+    pThreadInfo->ntables = g_Dbs.db[0].superTbls[0].childTblCount;
-    rInfo->end_table_to = g_Dbs.db[0].superTbls[0].childTblCount - 1;
+    pThreadInfo->end_table_to = g_Dbs.db[0].superTbls[0].childTblCount - 1;
-    rInfo->superTblInfo = &g_Dbs.db[0].superTbls[0];
+    pThreadInfo->superTblInfo = &g_Dbs.db[0].superTbls[0];
-    tstrncpy(rInfo->tb_prefix,
+    tstrncpy(pThreadInfo->tb_prefix,
          g_Dbs.db[0].superTbls[0].childTblPrefix, MAX_TB_NAME_SIZE);
  } else {
-    rInfo->ntables = g_args.num_of_tables;
+    pThreadInfo->ntables = g_args.num_of_tables;
-    rInfo->end_table_to = g_args.num_of_tables -1;
+    pThreadInfo->end_table_to = g_args.num_of_tables -1;
-    tstrncpy(rInfo->tb_prefix, g_args.tb_prefix, MAX_TB_NAME_SIZE);
+    tstrncpy(pThreadInfo->tb_prefix, g_args.tb_prefix, MAX_TB_NAME_SIZE);
  }
-  rInfo->taos = taos_connect(
+  pThreadInfo->taos = taos_connect(
          g_Dbs.host,
          g_Dbs.user,
          g_Dbs.password,
          g_Dbs.db[0].dbName,
          g_Dbs.port);
-  if (rInfo->taos == NULL) {
+  if (pThreadInfo->taos == NULL) {
    errorPrint( "Failed to connect to TDengine, reason:%s\n",
            taos_errstr(NULL));
-    free(rInfo);
+    free(pThreadInfo);
    exit(-1);
  }
-  tstrncpy(rInfo->fp, g_Dbs.resultFile, MAX_FILE_NAME_LEN);
+  tstrncpy(pThreadInfo->filePath, g_Dbs.resultFile, MAX_FILE_NAME_LEN);
  if (!g_Dbs.use_metric) {
-    pthread_create(&read_id, NULL, readTable, rInfo);
+    pthread_create(&read_id, NULL, readTable, pThreadInfo);
  } else {
-    pthread_create(&read_id, NULL, readMetric, rInfo);
+    pthread_create(&read_id, NULL, readMetric, pThreadInfo);
  }
  pthread_join(read_id, NULL);
-  taos_close(rInfo->taos);
+  taos_close(pThreadInfo->taos);
-  free(rInfo);
+  free(pThreadInfo);
 }
 static void testCmdLine() {

--- a/src/mnode/src/mnodeSdb.c
+++ b/src/mnode/src/mnodeSdb.c
@@ -719,13 +719,13 @@ static int32_t sdbProcessWrite(void *wparam, void *hparam, int32_t qtype, void *
  if (action == SDB_ACTION_INSERT) {
    return sdbPerformInsertAction(pHead, pTable);
  } else if (action == SDB_ACTION_DELETE) {
-    if (qtype == TAOS_QTYPE_FWD) {
+    //if (qtype == TAOS_QTYPE_FWD) {
      // Drop database/stable may take a long time and cause a timeout, so we confirm first then reput it into queue
-      sdbWriteFwdToQueue(1, hparam, TAOS_QTYPE_QUERY, unused);
+    //  sdbWriteFwdToQueue(1, hparam, TAOS_QTYPE_QUERY, unused);
-      return TSDB_CODE_SUCCESS;
+    //  return TSDB_CODE_SUCCESS;
-    } else {
+    //} else {
      return sdbPerformDeleteAction(pHead, pTable);
-    }
+    //}
  } else if (action == SDB_ACTION_UPDATE) {
    return sdbPerformUpdateAction(pHead, pTable);
  } else {

--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
@@ -1189,8 +1189,8 @@ static int32_t mnodeFindSuperTableTagIndex(SSTableObj *pStable, const char *tagN
 static int32_t mnodeAddSuperTableTagCb(SMnodeMsg *pMsg, int32_t code) {
  SSTableObj *pStable = (SSTableObj *)pMsg->pTable;
-  mLInfo("msg:%p, app:%p stable %s, add tag result:%s", pMsg, pMsg->rpcMsg.ahandle, pStable->info.tableId,
+  mLInfo("msg:%p, app:%p stable %s, add tag result:%s, numOfTags:%d", pMsg, pMsg->rpcMsg.ahandle, pStable->info.tableId,
-          tstrerror(code));
+          tstrerror(code), pStable->numOfTags);
  return code;
 }

--- a/src/mnode/src/mnodeVgroup.c
+++ b/src/mnode/src/mnodeVgroup.c
@@ -121,7 +121,7 @@ static int32_t mnodeVgroupActionDelete(SSdbRow *pRow) {
  SVgObj *pVgroup = pRow->pObj;
  if (pVgroup->pDb == NULL) {
-    mError("vgId:%d, db:%s is not exist while insert into hash", pVgroup->vgId, pVgroup->dbName);
+    mError("vgId:%d, db:%s is not exist while delete from hash", pVgroup->vgId, pVgroup->dbName);
    return TSDB_CODE_MND_VGROUP_NOT_EXIST;
  }

--- a/src/os/src/detail/osMemory.c
+++ b/src/os/src/detail/osMemory.c
@@ -62,7 +62,7 @@ static void* taosRandomRealloc(void* ptr, size_t size, const char* file, uint32_
 static char* taosRandomStrdup(const char* str, const char* file, uint32_t line) {
  size_t len = strlen(str);
-  return taosRandomAllocFail(len + 1, file, line) ? NULL : taosStrdupImp(str);
+  return taosRandomAllocFail(len + 1, file, line) ? NULL : tstrdup(str);
 }
 static char* taosRandomStrndup(const char* str, size_t size, const char* file, uint32_t line) {
@@ -70,11 +70,11 @@ static char* taosRandomStrndup(const char* str, size_t size, const char* file, u
  if (len > size) {
    len = size;
  }
-  return taosRandomAllocFail(len + 1, file, line) ? NULL : taosStrndupImp(str, len);
+  return taosRandomAllocFail(len + 1, file, line) ? NULL : tstrndup(str, len);
 }
 static ssize_t taosRandomGetline(char **lineptr, size_t *n, FILE *stream, const char* file, uint32_t line) {
-  return taosRandomAllocFail(*n, file, line) ? -1 : taosGetlineImp(lineptr, n, stream);
+  return taosRandomAllocFail(*n, file, line) ? -1 : tgetline(lineptr, n, stream);
 }
 ////////////////////////////////////////////////////////////////////////////////
@@ -242,7 +242,7 @@ static char* taosStrndupDetectLeak(const char* str, size_t size, const char* fil
 static ssize_t taosGetlineDetectLeak(char **lineptr, size_t *n, FILE *stream, const char* file, uint32_t line) {
  char* buf = NULL;
  size_t bufSize = 0;
-  ssize_t size = taosGetlineImp(&buf, &bufSize, stream);
+  ssize_t size = tgetline(&buf, &bufSize, stream);
  if (size != -1) {
    if (*n < size + 1) {
      void* p = taosReallocDetectLeak(*lineptr, size + 1, file, line);
@@ -372,7 +372,7 @@ void  taosFreeMem(void* ptr, const char* file, uint32_t line) {
 char* taosStrdupMem(const char* str, const char* file, uint32_t line) {
  switch (allocMode) {
    case TAOS_ALLOC_MODE_DEFAULT:
-      return taosStrdupImp(str);
+      return tstrdup(str);
    case TAOS_ALLOC_MODE_RANDOM_FAIL:
      return taosRandomStrdup(str, file, line);
@@ -380,13 +380,13 @@ char* taosStrdupMem(const char* str, const char* file, uint32_t line) {
    case TAOS_ALLOC_MODE_DETECT_LEAK:
      return taosStrdupDetectLeak(str, file, line);
  }
-  return taosStrdupImp(str);
+  return tstrdup(str);
 }
 char* taosStrndupMem(const char* str, size_t size, const char* file, uint32_t line) {
  switch (allocMode) {
    case TAOS_ALLOC_MODE_DEFAULT:
-      return taosStrndupImp(str, size);
+      return tstrndup(str, size);
    case TAOS_ALLOC_MODE_RANDOM_FAIL:
      return taosRandomStrndup(str, size, file, line);
@@ -394,13 +394,13 @@ char* taosStrndupMem(const char* str, size_t size, const char* file, uint32_t li
    case TAOS_ALLOC_MODE_DETECT_LEAK:
      return taosStrndupDetectLeak(str, size, file, line);
  }
-  return taosStrndupImp(str, size);
+  return tstrndup(str, size);
 }
 ssize_t taosGetlineMem(char **lineptr, size_t *n, FILE *stream, const char* file, uint32_t line) {
  switch (allocMode) {
    case TAOS_ALLOC_MODE_DEFAULT:
-      return taosGetlineImp(lineptr, n, stream);
+      return tgetline(lineptr, n, stream);
    case TAOS_ALLOC_MODE_RANDOM_FAIL:
      return taosRandomGetline(lineptr, n, stream, file, line);
@@ -408,7 +408,7 @@ ssize_t taosGetlineMem(char **lineptr, size_t *n, FILE *stream, const char* file
    case TAOS_ALLOC_MODE_DETECT_LEAK:
      return taosGetlineDetectLeak(lineptr, n, stream, file, line);
  }
-  return taosGetlineImp(lineptr, n, stream);
+  return tgetline(lineptr, n, stream);
 }
 static void taosCloseAllocLog() {
@@ -517,4 +517,4 @@ void* taosTZfree(void* ptr) {
    free((void*)((char*)ptr - sizeof(size_t)));
  }
  return NULL;
 }
\ No newline at end of file
--- a/src/os/src/windows/wSemphone.c
+++ b/src/os/src/windows/wSemphone.c
@@ -14,6 +14,7 @@
 */
 #define _DEFAULT_SOURCE
 #include "os.h"
 #include "taosdef.h"
 #include "tglobal.h"
@@ -24,7 +25,7 @@
 bool taosCheckPthreadValid(pthread_t thread) { return thread.p != NULL; }
-void taosResetPthread(pthread_t *thread) { thread->p = 0; }
+void taosResetPthread(pthread_t* thread) { thread->p = 0; }
 int64_t taosGetPthreadId(pthread_t thread) {
 #ifdef PTW32_VERSION
@@ -34,27 +35,24 @@ int64_t taosGetPthreadId(pthread_t thread) {
 #endif
 }
-int64_t taosGetSelfPthreadId() {
+int64_t taosGetSelfPthreadId() { return GetCurrentThreadId(); }
-  return GetCurrentThreadId();
-}
-bool taosComparePthread(pthread_t first, pthread_t second) {
+bool taosComparePthread(pthread_t first, pthread_t second) { return first.p == second.p; }
-  return first.p == second.p;
-}
-int32_t taosGetPId() {
+int32_t taosGetPId() { return GetCurrentProcessId(); }
-  return GetCurrentProcessId();
-}
-int32_t taosGetCurrentAPPName(char *name, int32_t* len) {
+int32_t taosGetCurrentAPPName(char* name, int32_t* len) {
  char filepath[1024] = {0};
  GetModuleFileName(NULL, filepath, MAX_PATH);
-  *strrchr(filepath,'.') = '\0';
+  char* sub = strrchr(filepath, '.');
+  if (sub != NULL) {
+    *sub = '\0';
+  }
  strcpy(name, filepath);
  if (len != NULL) {
-    *len = (int32_t) strlen(filepath);
+    *len = (int32_t)strlen(filepath);
  }
  return 0;

--- a/src/sync/src/syncMain.c
+++ b/src/sync/src/syncMain.c
@@ -709,7 +709,7 @@ static void syncChooseMaster(SSyncNode *pNode) {
 }
 static SSyncPeer *syncCheckMaster(SSyncNode *pNode) {
-  int32_t onlineNum = 0;
+  int32_t onlineNum = 0, arbOnlineNum = 0;
  int32_t masterIndex = -1;
  int32_t replica = pNode->replica;
@@ -723,13 +723,15 @@ static SSyncPeer *syncCheckMaster(SSyncNode *pNode) {
  SSyncPeer *pArb = pNode->peerInfo[TAOS_SYNC_MAX_REPLICA];
  if (pArb && pArb->role != TAOS_SYNC_ROLE_OFFLINE) {
    onlineNum++;
+    ++arbOnlineNum;
    replica = pNode->replica + 1;
  }
  if (onlineNum <= replica * 0.5) {
    if (nodeRole != TAOS_SYNC_ROLE_UNSYNCED) {
-       if (nodeRole == TAOS_SYNC_ROLE_MASTER && onlineNum == replica * 0.5 && onlineNum >= 1) {
+      if (nodeRole == TAOS_SYNC_ROLE_MASTER && onlineNum == replica * 0.5 && ((replica > 2 && onlineNum - arbOnlineNum > 1) || pNode->replica < 3)) {
         sInfo("vgId:%d, self keep work as master, online:%d replica:%d", pNode->vgId, onlineNum, replica);
+	 masterIndex = pNode->selfIndex;
       } else {
        nodeRole = TAOS_SYNC_ROLE_UNSYNCED;
        sInfo("vgId:%d, self change to unsynced state, online:%d replica:%d", pNode->vgId, onlineNum, replica);
@@ -1002,6 +1004,7 @@ static void syncProcessForwardFromPeer(char *cont, SSyncPeer *pPeer) {
  if (nodeRole == TAOS_SYNC_ROLE_SLAVE) {
    // nodeVersion = pHead->version;
    code = (*pNode->writeToCacheFp)(pNode->vgId, pHead, TAOS_QTYPE_FWD, NULL);
+    syncConfirmForward(pNode->rid, pHead->version, code, false);
  } else {
    if (nodeSStatus != TAOS_SYNC_STATUS_INIT) {
      code = syncSaveIntoBuffer(pPeer, pHead);
@@ -1404,7 +1407,7 @@ static void syncMonitorFwdInfos(void *param, void *tmrId) {
      pthread_mutex_lock(&pNode->mutex);
      for (int32_t i = 0; i < pSyncFwds->fwds; ++i) {
        SFwdInfo *pFwdInfo = pSyncFwds->fwdInfo + (pSyncFwds->first + i) % SYNC_MAX_FWDS;
-        if (ABS(time - pFwdInfo->time) < 2000) break;
+        if (ABS(time - pFwdInfo->time) < 10000) break;
        sDebug("vgId:%d, forward info expired, hver:%" PRIu64 " curtime:%" PRIu64 " savetime:%" PRIu64, pNode->vgId,
               pFwdInfo->version, time, pFwdInfo->time);

--- a/src/util/src/tcache.c
+++ b/src/util/src/tcache.c
@@ -613,7 +613,7 @@ void doCleanupDataCache(SCacheObj *pCacheObj) {
  // todo memory leak if there are object with refcount greater than 0 in hash table?
  taosHashCleanup(pCacheObj->pHashTable);
-  taosTrashcanEmpty(pCacheObj, true);
+  taosTrashcanEmpty(pCacheObj, false);
  __cache_lock_destroy(pCacheObj);

--- a/src/vnode/src/vnodeMain.c
+++ b/src/vnode/src/vnodeMain.c
@@ -454,7 +454,11 @@ void vnodeDestroy(SVnodeObj *pVnode) {
  }
  if (pVnode->tsdb) {
-    code = tsdbCloseRepo(pVnode->tsdb, 1);
+    // the deleted vnode does not need to commit, so as to speed up the deletion
+    int toCommit = 1;
+    if (pVnode->dropped) toCommit = 0;
+    code = tsdbCloseRepo(pVnode->tsdb, toCommit);
    pVnode->tsdb = NULL;
  }

--- a/src/vnode/src/vnodeSync.c
+++ b/src/vnode/src/vnodeSync.c
@@ -126,11 +126,16 @@ void vnodeStopSyncFile(int32_t vgId, uint64_t fversion) {
 }
 void vnodeConfirmForard(int32_t vgId, void *wparam, int32_t code) {
-  void *pVnode = vnodeAcquire(vgId);
+  SVnodeObj *pVnode = vnodeAcquire(vgId);
  if (pVnode == NULL) {
    vError("vgId:%d, vnode not found while confirm forward", vgId);
  }
+  if (code == TSDB_CODE_SYN_CONFIRM_EXPIRED && pVnode->status == TAOS_VN_STATUS_CLOSING) {
+    vDebug("vgId:%d, db:%s, vnode is closing while confirm forward", vgId, pVnode->db);
+    code = TSDB_CODE_VND_IS_CLOSING;
+  }
  dnodeSendRpcVWriteRsp(pVnode, wparam, code);
  vnodeRelease(pVnode);
 }

--- a/tests/Jenkinsfile
+++ b/tests/Jenkinsfile
@@ -37,7 +37,7 @@ pipeline {
      stage('Parallel test stage') {
      parallel {
        stage('pytest') {
-          agent{label '184'}
+          agent{label 'slad1'}
          steps {
            pre_test()
            sh '''
@@ -62,7 +62,7 @@ pipeline {
        }
        stage('test_crash_gen') {
-          agent{label "185"}
+          agent{label "slad2"}
          steps {
            pre_test()
            sh '''
@@ -149,7 +149,7 @@ pipeline {
        }
        stage('test_valgrind') {
-          agent{label "186"}
+          agent{label "slad3"}
          steps {
            pre_test()

--- a/tests/mas/Jenkinsfile
+++ b/tests/mas/Jenkinsfile
+def pre_test(){
+    sh '''
+    sudo rmtaos||echo 'no taosd installed'
+    '''
+    sh '''
+    cd ${WKC}
+    git reset --hard
+    git checkout $BRANCH_NAME
+    git pull
+    git submodule update
+    cd ${WK}
+    git reset --hard
+    git checkout $BRANCH_NAME
+    git pull
+    export TZ=Asia/Harbin
+    date
+    rm -rf ${WK}/debug
+    mkdir debug
+    cd debug
+    cmake .. > /dev/null
+    make > /dev/null
+    make install > /dev/null
+    pip3 install ${WKC}/src/connector/python/linux/python3/
+    '''
+    return 1
+}
+pipeline {
+  agent none
+  environment{
+      WK = '/var/lib/jenkins/workspace/TDinternal'
+      WKC= '/var/lib/jenkins/workspace/TDinternal/community'
+  }
+  stages {
+      stage('Parallel test stage') {
+      parallel {
+        stage('pytest') {
+          agent{label 'slam1'}
+          steps {
+            pre_test()
+            sh '''
+            cd ${WKC}/tests
+            find pytest -name '*'sql|xargs rm -rf
+            ./test-all.sh pytest
+            date'''
+          }
+        }
+        stage('test_b1') {
+          agent{label 'slam2'}
+          steps {
+            pre_test()
+            sh '''
+            cd ${WKC}/tests
+            ./test-all.sh b1
+            date'''
+          }
+        }
+        stage('test_crash_gen') {
+          agent{label "slam3"}
+          steps {
+            pre_test()
+            sh '''
+            cd ${WKC}/tests/pytest
+            '''
+            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                sh '''
+                cd ${WKC}/tests/pytest
+                ./crash_gen.sh -a -p -t 4 -s 2000
+                '''
+            }
+            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                sh '''
+                cd ${WKC}/tests/pytest
+                rm -rf /var/lib/taos/*
+                rm -rf /var/log/taos/*
+                ./handle_crash_gen_val_log.sh
+                '''
+            }
+            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                sh '''
+                cd ${WKC}/tests/pytest
+                rm -rf /var/lib/taos/*
+                rm -rf /var/log/taos/*
+                ./handle_taosd_val_log.sh
+                '''
+            }
+            sh'''
+            systemctl start taosd 
+            sleep 10
+            '''
+            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                sh '''
+                cd ${WKC}/tests/gotest
+                bash batchtest.sh
+                '''
+            }
+            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                sh '''
+                cd ${WKC}/tests/examples/python/PYTHONConnectorChecker
+                python3 PythonChecker.py
+                '''
+            }
+            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                sh '''
+                cd ${WKC}/tests/examples/JDBC/JDBCDemo/
+                mvn clean package assembly:single -DskipTests >/dev/null 
+                java -jar target/JDBCDemo-SNAPSHOT-jar-with-dependencies.jar -host 127.0.0.1
+                '''
+            }
+            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                sh '''
+                cd ${WKC}/src/connector/jdbc
+                mvn clean package -Dmaven.test.skip=true >/dev/null 
+                cd ${WKC}/tests/examples/JDBC/JDBCDemo/
+                java --class-path=../../../../src/connector/jdbc/target:$JAVA_HOME/jre/lib/ext -jar target/JDBCDemo-SNAPSHOT-jar-with-dependencies.jar -host 127.0.0.1
+                '''
+            }
+            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                sh '''
+                cp -rf ${WKC}/tests/examples/nodejs ${JENKINS_HOME}/workspace/
+                cd ${JENKINS_HOME}/workspace/nodejs
+                node nodejsChecker.js host=localhost
+                '''
+            }
+            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                sh '''
+                cd ${JENKINS_HOME}/workspace/C#NET/src/CheckC#
+                dotnet run
+                '''
+            }
+            sh '''
+            systemctl stop taosd 
+            cd ${WKC}/tests
+            ./test-all.sh b2
+            date
+            '''
+            sh '''
+            cd ${WKC}/tests
+            ./test-all.sh full unit
+            date'''
+          }
+        }
+        stage('test_valgrind') {
+          agent{label "slam4"}
+          steps {
+            pre_test()
+            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                sh '''
+                cd ${WKC}/tests/pytest
+                nohup taosd >/dev/null &
+                sleep 10
+                python3 concurrent_inquiry.py -c 1
+                '''
+            }
+            sh '''
+            cd ${WKC}/tests
+            ./test-all.sh full jdbc
+            date'''
+            sh '''
+            cd ${WKC}/tests/pytest
+            ./valgrind-test.sh 2>&1 > mem-error-out.log
+            ./handle_val_log.sh
+            date
+            cd ${WKC}/tests
+            ./test-all.sh b3
+            date'''
+            sh '''
+            date
+            cd ${WKC}/tests
+            ./test-all.sh full example
+            date'''
+          }
+        }
+       stage('arm64_build'){
+                agent{label 'arm64'}
+                steps{
+                    sh '''
+                    cd ${WK}
+                    git fetch
+                    git checkout develop
+                    git pull
+                    cd ${WKC}
+                    git fetch
+                    git checkout develop
+                    git pull
+                    git submodule update                    
+                    cd ${WKC}/packaging
+                    ./release.sh -v cluster -c aarch64 -n 2.0.0.0 -m 2.0.0.0
+                    '''
+                }
+            }
+            stage('arm32_build'){
+                agent{label 'arm32'}
+                steps{
+                    catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                        sh '''
+                        cd ${WK}
+                        git fetch
+                        git checkout develop
+                        git pull
+                        cd ${WKC}
+                        git fetch
+                        git checkout develop
+                        git pull
+                        git submodule update
+                        cd ${WKC}/packaging
+                        ./release.sh -v cluster -c aarch32 -n 2.0.0.0 -m 2.0.0.0
+                        '''
+                    }
+                }
+            }
+      }
+    }
+  }
+  post {             
+        success {
+            emailext (
+                subject: "SUCCESSFUL: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'",
+                body: '''<!DOCTYPE html>
+                <html>
+                <head>
+                <meta charset="UTF-8">
+                </head>
+                <body leftmargin="8" marginwidth="0" topmargin="8" marginheight="4" offset="0">
+                    <table width="95%" cellpadding="0" cellspacing="0" style="font-size: 16pt; font-family: Tahoma, Arial, Helvetica, sans-serif">
+                        <tr>
+                            <td><br />
+                                <b><font color="#0B610B"><font size="6">构建信息</font></font></b>
+                                <hr size="2" width="100%" align="center" /></td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <ul>
+                                <div style="font-size:18px">
+                                    <li>构建名称>>分支：${PROJECT_NAME}</li>
+                                    <li>构建结果：<span style="color:green"> Successful </span></li>
+                                    <li>构建编号：${BUILD_NUMBER}</li>
+                                    <li>触发用户：${CAUSE}</li>
+                                    <li>变更概要：${CHANGES}</li>
+                                    <li>构建地址：<a href=${BUILD_URL}>${BUILD_URL}</a></li>
+                                    <li>构建日志：<a href=${BUILD_URL}console>${BUILD_URL}console</a></li>
+                                    <li>变更集：${JELLY_SCRIPT}</li>
+                                </div>
+                                </ul>
+                            </td>
+                        </tr>
+                    </table></font>
+                </body>
+                </html>''',
+                to: "yqliu@taosdata.com,pxiao@taosdata.com",
+                from: "support@taosdata.com"
+            )
+        }
+        failure {
+            emailext (
+                subject: "FAILED: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'",
+                body: '''<!DOCTYPE html>
+                <html>
+                <head>
+                <meta charset="UTF-8">
+                </head>
+                <body leftmargin="8" marginwidth="0" topmargin="8" marginheight="4" offset="0">
+                    <table width="95%" cellpadding="0" cellspacing="0" style="font-size: 16pt; font-family: Tahoma, Arial, Helvetica, sans-serif">
+                        <tr>
+                            <td><br />
+                                <b><font color="#0B610B"><font size="6">构建信息</font></font></b>
+                                <hr size="2" width="100%" align="center" /></td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <ul>
+                                <div style="font-size:18px">
+                                    <li>构建名称>>分支：${PROJECT_NAME}</li>
+                                    <li>构建结果：<span style="color:green"> Successful </span></li>
+                                    <li>构建编号：${BUILD_NUMBER}</li>
+                                    <li>触发用户：${CAUSE}</li>
+                                    <li>变更概要：${CHANGES}</li>
+                                    <li>构建地址：<a href=${BUILD_URL}>${BUILD_URL}</a></li>
+                                    <li>构建日志：<a href=${BUILD_URL}console>${BUILD_URL}console</a></li>
+                                    <li>变更集：${JELLY_SCRIPT}</li>
+                                </div>
+                                </ul>
+                            </td>
+                        </tr>
+                    </table></font>
+                </body>
+                </html>''',
+                to: "yqliu@taosdata.com,pxiao@taosdata.com",
+                from: "support@taosdata.com"
+            )
+        }
+    }
+}
\ No newline at end of file
--- a/tests/perftest-scripts/perftest-query.sh
+++ b/tests/perftest-scripts/perftest-query.sh
@@ -64,18 +64,25 @@ function runQueryPerfTest {
 	[ -f $PERFORMANCE_TEST_REPORT ] && rm $PERFORMANCE_TEST_REPORT
 	nohup $WORK_DIR/TDengine/debug/build/bin/taosd -c /etc/taosperf/ > /dev/null 2>&1 &
 	echoInfo "Wait TDengine to start"
-	sleep 300
+	sleep 60
 	echoInfo "Run Performance Test"	
 	cd $WORK_DIR/TDengine/tests/pytest
 	python3 query/queryPerformance.py -c $LOCAL_COMMIT | tee -a $PERFORMANCE_TEST_REPORT
+	mkdir -p /var/lib/perf/
+	mkdir -p /var/log/perf/
+	rm -rf /var/lib/perf/*
+	rm -rf /var/log/perf/*
+	nohup $WORK_DIR/TDengine/debug/build/bin/taosd -c /etc/perf/ > /dev/null 2>&1 &	
+	echoInfo "Wait TDengine to start"
+	sleep 10
+	echoInfo "Run Performance Test"	
+	cd $WORK_DIR/TDengine/tests/pytest
 	python3 insert/insertFromCSVPerformance.py -c $LOCAL_COMMIT | tee -a $PERFORMANCE_TEST_REPORT
 	python3 tools/taosdemoPerformance.py -c $LOCAL_COMMIT | tee -a $PERFORMANCE_TEST_REPORT
-	#python3 perfbenchmark/joinPerformance.py  | tee -a $PERFORMANCE_TEST_REPORT
 }

--- a/tests/pytest/crash_gen/service_manager.py
+++ b/tests/pytest/crash_gen/service_manager.py
@@ -22,7 +22,7 @@ from queue import Queue, Empty
 from .shared.config import Config
 from .shared.db import DbTarget, DbConn
 from .shared.misc import Logging, Helper, CrashGenError, Status, Progress, Dice
-from .shared.types import DirPath
+from .shared.types import DirPath, IpcStream
 # from crash_gen.misc import CrashGenError, Dice, Helper, Logging, Progress, Status
 # from crash_gen.db import DbConn, DbTarget
@@ -177,13 +177,12 @@ quorum 2
        return "127.0.0.1"
    def getServiceCmdLine(self): # to start the instance
-        cmdLine = []
        if Config.getConfig().track_memory_leaks:
            Logging.info("Invoking VALGRIND on service...")
-            cmdLine = ['valgrind', '--leak-check=yes']
+            return ['exec /usr/bin/valgrind', '--leak-check=yes', self.getExecFile(), '-c', self.getCfgDir()]
-        # TODO: move "exec -c" into Popen(), we can both "use shell" and NOT fork so ask to lose kill control
+        else:
-        cmdLine += ["exec " + self.getExecFile(), '-c', self.getCfgDir()] # used in subproce.Popen()        
+            # TODO: move "exec -c" into Popen(), we can both "use shell" and NOT fork so ask to lose kill control
-        return cmdLine
+            return ["exec " + self.getExecFile(), '-c', self.getCfgDir()] # used in subproce.Popen()
    def _getDnodes(self, dbc):
        dbc.query("show dnodes")
@@ -281,16 +280,16 @@ class TdeSubProcess:
        return '[TdeSubProc: pid = {}, status = {}]'.format(
            self.getPid(), self.getStatus() )
-    def getStdOut(self) -> BinaryIO :
+    def getIpcStdOut(self) -> IpcStream :
        if self._popen.universal_newlines : # alias of text_mode
            raise CrashGenError("We need binary mode for STDOUT IPC")
        # Logging.info("Type of stdout is: {}".format(type(self._popen.stdout)))
-        return typing.cast(BinaryIO, self._popen.stdout)
+        return typing.cast(IpcStream, self._popen.stdout)
-    def getStdErr(self) -> BinaryIO :
+    def getIpcStdErr(self) -> IpcStream :
        if self._popen.universal_newlines : # alias of text_mode
            raise CrashGenError("We need binary mode for STDERR IPC")
-        return typing.cast(BinaryIO, self._popen.stderr)
+        return typing.cast(IpcStream, self._popen.stderr)
    # Now it's always running, since we matched the life cycle
    # def isRunning(self):
@@ -301,11 +300,6 @@ class TdeSubProcess:
    def _start(self, cmdLine) -> Popen :
        ON_POSIX = 'posix' in sys.builtin_module_names
-        # Sanity check
-        # if self.subProcess:  # already there
-        #     raise RuntimeError("Corrupt process state")
        # Prepare environment variables for coverage information
        # Ref: https://stackoverflow.com/questions/2231227/python-subprocess-popen-with-a-modified-environment
@@ -314,9 +308,8 @@ class TdeSubProcess:
        # print(myEnv)
        # print("Starting TDengine with env: ", myEnv.items())
-        # print("Starting TDengine via Shell: {}".format(cmdLineStr))
+        print("Starting TDengine: {}".format(cmdLine))
-        # useShell = True # Needed to pass environments into it
        return Popen(            
            ' '.join(cmdLine), # ' '.join(cmdLine) if useShell else cmdLine,
            shell=True, # Always use shell, since we need to pass ENV vars
@@ -732,19 +725,19 @@ class ServiceManagerThread:
        self._ipcQueue = Queue() # type: Queue
        self._thread = threading.Thread( # First thread captures server OUTPUT
            target=self.svcOutputReader,
-            args=(subProc.getStdOut(), self._ipcQueue, logDir))
+            args=(subProc.getIpcStdOut(), self._ipcQueue, logDir))
        self._thread.daemon = True  # thread dies with the program
        self._thread.start()
        time.sleep(0.01)
        if not self._thread.is_alive(): # What happened?
-            Logging.info("Failed to started process to monitor STDOUT")
+            Logging.info("Failed to start process to monitor STDOUT")
            self.stop()
            raise CrashGenError("Failed to start thread to monitor STDOUT")
        Logging.info("Successfully started process to monitor STDOUT")
        self._thread2 = threading.Thread( # 2nd thread captures server ERRORs
            target=self.svcErrorReader,
-            args=(subProc.getStdErr(), self._ipcQueue, logDir))
+            args=(subProc.getIpcStdErr(), self._ipcQueue, logDir))
        self._thread2.daemon = True  # thread dies with the program
        self._thread2.start()
        time.sleep(0.01)
@@ -887,14 +880,19 @@ class ServiceManagerThread:
            print("\nNon-UTF8 server output: {}\n".format(bChunk.decode('cp437')))
            return None
-    def _textChunkGenerator(self, streamIn: BinaryIO, logDir: str, logFile: str
+    def _textChunkGenerator(self, streamIn: IpcStream, logDir: str, logFile: str
            ) -> Generator[TextChunk, None, None]:
        '''
-        Take an input stream with binary data, produced a generator of decoded
+        Take an input stream with binary data (likely from Popen), produced a generator of decoded
-        "text chunks", and also save the original binary data in a log file.
+        "text chunks".
+        Side effect: it also save the original binary data in a log file.
        '''
        os.makedirs(logDir, exist_ok=True)
        logF = open(os.path.join(logDir, logFile), 'wb')
+        if logF is None:
+            Logging.error("Failed to open log file (binary write): {}/{}".format(logDir, logFile))
+            return
        for bChunk in iter(streamIn.readline, b''):
            logF.write(bChunk) # Write to log file immediately
            tChunk = self._decodeBinaryChunk(bChunk) # decode
@@ -902,14 +900,14 @@ class ServiceManagerThread:
                yield tChunk # TODO: split into actual text lines
        # At the end...
-        streamIn.close() # Close the stream
+        streamIn.close() # Close the incoming stream
-        logF.close() # Close the output file
+        logF.close() # Close the log file
-    def svcOutputReader(self, stdOut: BinaryIO, queue, logDir: str):
+    def svcOutputReader(self, ipcStdOut: IpcStream, queue, logDir: str):
        '''
        The infinite routine that processes the STDOUT stream for the sub process being managed.
-        :param stdOut: the IO stream object used to fetch the data from
+        :param ipcStdOut: the IO stream object used to fetch the data from
        :param queue: the queue where we dump the roughly parsed chunk-by-chunk text data
        :param logDir: where we should dump a verbatim output file
        '''
@@ -917,7 +915,7 @@ class ServiceManagerThread:
        # Important Reference: https://stackoverflow.com/questions/375427/non-blocking-read-on-a-subprocess-pipe-in-python
        # print("This is the svcOutput Reader...")
        # stdOut.readline() # Skip the first output? TODO: remove?
-        for tChunk in self._textChunkGenerator(stdOut, logDir, 'stdout.log') :
+        for tChunk in self._textChunkGenerator(ipcStdOut, logDir, 'stdout.log') :
            queue.put(tChunk) # tChunk garanteed not to be None
            self._printProgress("_i")
@@ -940,12 +938,12 @@ class ServiceManagerThread:
        Logging.info("EOF found TDengine STDOUT, marking the process as terminated")
        self.setStatus(Status.STATUS_STOPPED)
-    def svcErrorReader(self, stdErr: BinaryIO, queue, logDir: str):
+    def svcErrorReader(self, ipcStdErr: IpcStream, queue, logDir: str):
        # os.makedirs(logDir, exist_ok=True)
        # logFile = os.path.join(logDir,'stderr.log')
        # fErr = open(logFile, 'wb')
        # for line in iter(err.readline, b''):
-        for tChunk in self._textChunkGenerator(stdErr, logDir, 'stderr.log') :
+        for tChunk in self._textChunkGenerator(ipcStdErr, logDir, 'stderr.log') :
            queue.put(tChunk) # tChunk garanteed not to be None
            # fErr.write(line)
            Logging.info("TDengine STDERR: {}".format(tChunk))

--- a/tests/pytest/crash_gen/shared/types.py
+++ b/tests/pytest/crash_gen/shared/types.py
-from typing import Any, List, Dict, NewType
+from typing import Any, BinaryIO, List, Dict, NewType
 from enum import Enum
 DirPath = NewType('DirPath', str)
@@ -26,3 +26,5 @@ class TdDataType(Enum):
 TdColumns = Dict[str, TdDataType]
 TdTags    = Dict[str, TdDataType]
+IpcStream = NewType('IpcStream', BinaryIO)
\ No newline at end of file
--- a/tests/pytest/fulltest.sh
+++ b/tests/pytest/fulltest.sh
@@ -183,7 +183,7 @@ python3 ./test.py -f stable/query_after_reset.py
 # perfbenchmark
 python3 ./test.py -f perfbenchmark/bug3433.py
 #python3 ./test.py -f perfbenchmark/bug3589.py
+python3 ./test.py -f perfbenchmark/taosdemoInsert.py
 #query
 python3 ./test.py -f query/filter.py

--- a/tests/pytest/insert/insertFromCSVPerformance.py
+++ b/tests/pytest/insert/insertFromCSVPerformance.py
@@ -31,7 +31,7 @@ class insertFromCSVPerformace:
        self.host = "127.0.0.1"
        self.user = "root"
        self.password = "taosdata"
-        self.config = "/etc/taosperf"
+        self.config = "/etc/perf"
        self.conn = taos.connect(
            self.host,
            self.user,

--- a/tests/pytest/perfbenchmark/taosdemoInsert.py
+++ b/tests/pytest/perfbenchmark/taosdemoInsert.py
+###################################################################
+#           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 taos
+import sys
+import os
+import json
+import argparse
+import subprocess
+import datetime
+import re
+from multiprocessing import cpu_count
+from util.log import *
+from util.sql import *
+from util.cases import *
+from util.dnodes import *
+from util.dnodes import TDDnode
+class Taosdemo:
+    def __init__(self, clearCache, dbName, keep):
+        self.clearCache = clearCache
+        self.dbname = dbName
+        self.drop = "yes"
+        self.keep = keep
+        self.host = "127.0.0.1"
+        self.user = "root"
+        self.password = "taosdata"
+        # self.config = "/etc/taosperf"
+        # self.conn = taos.connect(
+        #     self.host,
+        #     self.user,
+        #     self.password,
+        #     self.config)
+    # env config
+    def getBuildPath(self) -> str:
+        selfPath = os.path.dirname(os.path.realpath(__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("/debug/build/bin")]
+                    break
+        return buildPath
+    def getExeToolsDir(self) -> str:
+        self.debugdir = self.getBuildPath() + "/debug/build/bin"
+        return self.debugdir
+    def getCfgDir(self) -> str:
+        self.config = self.getBuildPath() + "/sim/dnode1/cfg"
+        return self.config
+    # taodemo insert file config
+    def dbinfocfg(self) -> dict:
+        return {
+            "name": self.dbname,
+            "drop": self.drop,
+            "replica": 1,
+            "days": 10,
+            "cache": 16,
+            "blocks": 8,
+            "precision": "ms",
+            "keep": self.keep,
+            "minRows": 100,
+            "maxRows": 4096,
+            "comp": 2,
+            "walLevel": 1,
+            "cachelast": 0,
+            "quorum": 1,
+            "fsync": 3000,
+            "update": 0
+        }
+    def type_check(func):
+        def wrapper(self, **kwargs):
+            num_types = ["int", "float", "bigint", "tinyint", "smallint", "double"]
+            str_types = ["binary", "nchar"]
+            for k ,v in kwargs.items():
+                if k.lower() not in num_types and k.lower() not in str_types:
+                    return f"args {k} type error, not allowed"
+                elif not isinstance(v, (int, list, tuple)):
+                    return f"value {v} type error, not allowed"
+                elif k.lower() in num_types and not isinstance(v, int):
+                    return f"arg {v} takes 1 positional argument must be type int "
+                elif isinstance(v, (list,tuple)) and len(v) > 2:
+                    return f"arg {v} takes from 1 to 2 positional arguments but more than 2 were given "
+                elif isinstance(v,(list,tuple))  and [ False for _ in v if not isinstance(_, int) ]:
+                    return f"arg {v} takes from 1 to 2 positional arguments must be type int "
+                else:
+                    pass
+            return func(self, **kwargs)
+        return wrapper
+    @type_check
+    def column_tag_count(self, **column_tag) -> list :
+        init_column_tag = []
+        for k, v in column_tag.items():
+            if re.search(k, "int, float, bigint, tinyint, smallint, double", re.IGNORECASE):
+                init_column_tag.append({"type": k, "count": v})
+            elif re.search(k, "binary, nchar", re.IGNORECASE):
+                if isinstance(v, int):
+                    init_column_tag.append({"type": k, "count": v, "len":8})
+                elif len(v) == 1:
+                    init_column_tag.append({"type": k, "count": v[0], "len": 8})
+                else:
+                    init_column_tag.append({"type": k, "count": v[0], "len": v[1]})
+        return init_column_tag
+    def stbcfg(self, stb: str, child_tab_count: int, rows: int, prechildtab: str, columns: dict, tags: dict) -> dict:
+        return {
+            "name": stb,
+            "child_table_exists": "no",
+            "childtable_count": child_tab_count,
+            "childtable_prefix": prechildtab,
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 10,
+            "data_source": "rand",
+            "insert_mode": "taosc",
+            "insert_rows": rows,
+            "childtable_limit": 0,
+            "childtable_offset": 0,
+            "rows_per_tbl": 1,
+            "max_sql_len": 65480,
+            "disorder_ratio": 0,
+            "disorder_range": 1000,
+            "timestamp_step": 10,
+            "start_timestamp": f"{datetime.datetime.now():%F %X}",
+            "sample_format": "csv",
+            "sample_file": "./sample.csv",
+            "tags_file": "",
+            "columns": self.column_tag_count(**columns),
+            "tags": self.column_tag_count(**tags)
+        }
+    def schemecfg(self,intcount=1,floatcount=0,bcount=0,tcount=0,scount=0,doublecount=0,binarycount=0,ncharcount=0):
+        return  {
+            "INT": intcount,
+            "FLOAT": floatcount,
+            "BIGINT": bcount,
+            "TINYINT": tcount,
+            "SMALLINT": scount,
+            "DOUBLE": doublecount,
+            "BINARY": binarycount,
+            "NCHAR": ncharcount
+        }
+    def insertcfg(self,db: dict, stbs: list) -> dict:
+        return {
+            "filetype": "insert",
+            "cfgdir": self.config,
+            "host": self.host,
+            "port": 6030,
+            "user": self.user,
+            "password": self.password,
+            "thread_count": cpu_count(),
+            "thread_count_create_tbl": cpu_count(),
+            "result_file": "/tmp/insert_res.txt",
+            "confirm_parameter_prompt": "no",
+            "insert_interval": 0,
+            "num_of_records_per_req": 100,
+            "max_sql_len": 1024000,
+            "databases": [{
+                "dbinfo": db,
+                "super_tables": stbs
+            }]
+        }
+    def createinsertfile(self,db: dict, stbs: list) -> str:
+        date = datetime.datetime.now()
+        file_create_table = f"/tmp/insert_{date:%F-%H%M}.json"
+        with open(file_create_table, 'w') as f:
+            json.dump(self.insertcfg(db, stbs), f)
+        return file_create_table
+    # taosdemo query file config
+    def querysqls(self, sql: str) -> list:
+        return [{"sql":sql,"result":""}]
+    def querycfg(self, sql: str) -> dict:
+        return {
+            "filetype": "query",
+            "cfgdir": self.config,
+            "host": self.host,
+            "port": 6030,
+            "user": self.user,
+            "password": self.password,
+            "confirm_parameter_prompt": "yes",
+            "query_times": 10,
+            "query_mode": "taosc",
+            "databases": self.dbname,
+            "specified_table_query": {
+                "query_interval": 0,
+                "concurrent": cpu_count(),
+                "sqls": self.querysqls(sql)
+            }
+        }
+    def createqueryfile(self, sql: str):
+        date = datetime.datetime.now()
+        file_query_table = f"/tmp/query_{date:%F-%H%M}.json"
+        with open(file_query_table,"w") as f:
+            json.dump(self.querycfg(sql), f)
+        return file_query_table
+    # Execute taosdemo, and delete temporary files when finished
+    def taosdemotable(self, filepath: str, resultfile="/dev/null"):
+        taosdemopath = self.getBuildPath() + "/debug/build/bin"
+        with open(filepath,"r") as f:
+            filetype = json.load(f)["filetype"]
+            if filetype == "insert":
+                taosdemo_table_cmd = f"{taosdemopath}/taosdemo -f {filepath}  > {resultfile} 2>&1"
+            else:
+                taosdemo_table_cmd = f"yes | {taosdemopath}/taosdemo -f {filepath}  > {resultfile} 2>&1"
+        try:
+            _ = subprocess.check_output(taosdemo_table_cmd, shell=True).decode("utf-8")
+        except subprocess.CalledProcessError as e:
+            _ = e.output
+    def droptmpfile(self, filepath: str):
+        drop_file_cmd = f"[ -f {filepath} ] && rm -f  {filepath}"
+        try:
+            _ = subprocess.check_output(drop_file_cmd, shell=True).decode("utf-8")
+        except subprocess.CalledProcessError as e:
+            _ = e.output
+    # TODO:需要完成TD-4153的数据插入和客户端请求的性能查询。
+    def td4153insert(self):
+        tdLog.printNoPrefix("========== start to create table and insert data ==========")
+        self.dbname = "td4153"
+        db = self.dbinfocfg()
+        stblist = []
+        columntype = self.schemecfg(intcount=1, ncharcount=100)
+        tagtype = self.schemecfg(intcount=1)
+        stbname = "stb1"
+        prechild = "t1"
+        stable = self.stbcfg(
+            stb=stbname,
+            prechildtab=prechild,
+            child_tab_count=2,
+            rows=10000,
+            columns=columntype,
+            tags=tagtype
+        )
+        stblist.append(stable)
+        insertfile = self.createinsertfile(db=db, stbs=stblist)
+        nmon_file = f"/tmp/insert_{datetime.datetime.now():%F-%H%M}.nmon"
+        cmd = f"nmon -s5 -F {nmon_file} -m /tmp/"
+        try:
+            _ = subprocess.check_output(cmd, shell=True).decode("utf-8")
+        except subprocess.CalledProcessError as e:
+            _ = e.output
+        self.taosdemotable(insertfile)
+        self.droptmpfile(insertfile)
+        self.droptmpfile("/tmp/insert_res.txt")
+        # In order to prevent too many performance files from being generated, the nmon file is deleted.
+        # and the delete statement can be cancelled during the actual test.
+        self.droptmpfile(nmon_file)
+        cmd = f"ps -ef|grep -w nmon| grep -v grep | awk '{{print $2}}'"
+        try:
+            time.sleep(10)
+            _ = subprocess.check_output(cmd,shell=True).decode("utf-8")
+        except BaseException as e:
+            raise e
+    def td4153query(self):
+        tdLog.printNoPrefix("========== start to query operation ==========")
+        sqls = {
+            "select_all": "select * from stb1",
+            "select_join": "select * from t10, t11 where t10.ts=t11.ts"
+        }
+        for type, sql in sqls.items():
+            result_file = f"/tmp/queryResult_{type}.log"
+            query_file = self.createqueryfile(sql)
+            try:
+                self.taosdemotable(query_file, resultfile=result_file)
+            except subprocess.CalledProcessError as e:
+                out_put = e.output
+            if result_file:
+                print(f"execute rows {type.split('_')[1]} sql, the sql is: {sql}")
+                max_sql_time_cmd = f'''
+                grep -o Spent.*s {result_file} |awk 'NR==1{{max=$2;next}}{{max=max>$2?max:$2}}END{{print "Max=",max,"s"}}'
+                 '''
+                max_sql_time = subprocess.check_output(max_sql_time_cmd, shell=True).decode("UTF-8")
+                print(f"{type.split('_')[1]} rows sql time : {max_sql_time}")
+                min_sql_time_cmd = f'''
+                grep -o Spent.*s {result_file} |awk 'NR==1{{min=$2;next}}{{min=min<$2?min:$2}}END{{print "Min=",min,"s"}}'
+                '''
+                min_sql_time = subprocess.check_output(min_sql_time_cmd, shell=True).decode("UTF-8")
+                print(f"{type.split('_')[1]} rows sql time : {min_sql_time}")
+                avg_sql_time_cmd = f'''
+                grep -o Spent.*s {result_file} |awk '{{sum+=$2}}END{{print "Average=",sum/NR,"s"}}'
+                '''
+                avg_sql_time = subprocess.check_output(avg_sql_time_cmd, shell=True).decode("UTF-8")
+                print(f"{type.split('_')[1]} rows sql time : {avg_sql_time}")
+            self.droptmpfile(query_file)
+            self.droptmpfile(result_file)
+        drop_query_tmt_file_cmd = " find ./ -name 'querySystemInfo-*'  -type f -exec rm {} \; "
+        try:
+            _ = subprocess.check_output(drop_query_tmt_file_cmd, shell=True).decode("utf-8")
+        except subprocess.CalledProcessError as e:
+            _ = e.output
+        pass
+    def td4153(self):
+        self.td4153insert()
+        self.td4153query()
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        '-r',
+        '--remove-cache',
+        action='store_true',
+        default=False,
+        help='clear cache before query (default: False)')
+    parser.add_argument(
+        '-d',
+        '--database-name',
+        action='store',
+        default='db',
+        type=str,
+        help='Database name to be created (default: db)')
+    parser.add_argument(
+        '-k',
+        '--keep-time',
+        action='store',
+        default=3650,
+        type=int,
+        help='Database keep parameters (default: 3650)')
+    args = parser.parse_args()
+    taosdemo = Taosdemo(args.remove_cache, args.database_name, args.keep_time)
+    # taosdemo.conn = taos.connect(
+    #     taosdemo.host,
+    #     taosdemo.user,
+    #     taosdemo.password,
+    #     taosdemo.config
+    # )
+    debugdir = taosdemo.getExeToolsDir()
+    cfgdir = taosdemo.getCfgDir()
+    cmd = f"{debugdir}/taosd -c {cfgdir} >/dev/null 2>&1 &"
+    try:
+        _ = subprocess.check_output(cmd, shell=True).decode("utf-8")
+    except subprocess.CalledProcessError as e:
+        _ = e.output
+    if taosdemo.clearCache:
+        # must be root permission
+        subprocess.check_output("echo 3 > /proc/sys/vm/drop_caches", shell=True).decode("utf-8")
+    taosdemo.td4153()
--- a/tests/pytest/tools/taosdemoPerformance.py
+++ b/tests/pytest/tools/taosdemoPerformance.py
@@ -24,7 +24,7 @@ class taosdemoPerformace:
        self.host = "127.0.0.1"
        self.user = "root"
        self.password = "taosdata"
-        self.config = "/etc/taosperf"
+        self.config = "/etc/perf"
        self.conn = taos.connect(
            self.host,
            self.user,
@@ -77,7 +77,7 @@ class taosdemoPerformace:
        insert_data = {
            "filetype": "insert",
-            "cfgdir": "/etc/taosperf",
+            "cfgdir": "/etc/perf",
            "host": "127.0.0.1",
            "port": 6030,
            "user": "root",

--- a/tests/script/general/parser/select_with_tags.sim
+++ b/tests/script/general/parser/select_with_tags.sim
@@ -887,10 +887,16 @@ sql_error select tbname, t1 from select_tags_mt0 interval(1y);
 #valid sql: select first(c1), last(c2), count(*) from select_tags_mt0 group by tbname, t1;
 #valid sql: select first(c1), tbname, t1 from select_tags_mt0 group by t2;
+print ==================================>TD-4231
+sql_error select t1,tbname from select_tags_mt0 where c1<0
+sql_error select t1,tbname from select_tags_mt0 where c1<0 and tbname in ('select_tags_tb12')
+sql select tbname from select_tags_mt0 where tbname in ('select_tags_tb12');
 sql_error select first(c1), last(c2), t1 from select_tags_mt0 group by tbname;
 sql_error select first(c1), last(c2), tbname, t2 from select_tags_mt0 group by tbname;
 sql_error select first(c1), count(*), t2, t1, tbname from select_tags_mt0 group by tbname;
-# this sql is valid: select first(c1), t2 from select_tags_mt0 group by tbname;
+#valid sql: select first(c1), t2 from select_tags_mt0 group by tbname;
 #sql select first(ts), tbname from select_tags_mt0 group by tbname;
 #sql select count(c1) from select_tags_mt0 where c1=99 group by tbname;

--- a/tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim
@@ -158,7 +158,7 @@ if $dnode4Vtatus != offline then
  sleep 2000
  goto wait_dnode4_vgroup_offline
 endi
-if $dnode3Vtatus != master then
+if $dnode3Vtatus != unsynced then
  sleep 2000
  goto wait_dnode4_vgroup_offline
 endi

--- a/tests/script/unique/cluster/cache.sim
+++ b/tests/script/unique/cluster/cache.sim
@@ -41,7 +41,7 @@ sql create dnode $hostname2
 sleep 10000
 sql show log.tables;
-if $rows != 5 then
+if $rows > 6 then
  return -1
 endi

--- a/tests/script/unique/dnode/monitor.sim
+++ b/tests/script/unique/dnode/monitor.sim
@@ -56,7 +56,7 @@ print $data30
 print $data40
 print $data50
-if $rows != 5 then
+if $rows > 6 then
 	return -1
 endi

--- a/tests/script/unique/dnode/monitor_bug.sim
+++ b/tests/script/unique/dnode/monitor_bug.sim
@@ -19,7 +19,7 @@ sleep 3000
 sql show dnodes
 print dnode1 openVnodes $data2_1
-if $data2_1 != 1 then
+if $data2_1 > 2 then
 	return -1
 endi
@@ -41,7 +41,7 @@ print dnode2 openVnodes $data2_2
 if $data2_1 != 0 then
 	goto show2
 endi
-if $data2_2 != 1 then
+if $data2_2 > 2 then
 	goto show2
 endi
@@ -55,7 +55,7 @@ print $data30
 print $data40
 print $data50
-if $rows != 4 then
+if $rows > 5 then
 	return -1
 endi