diff --git a/.appveyor.yml b/.appveyor.yml
deleted file mode 100644
index e7802b3d0d3cf969381b5fa2a99862b3df5aa05f..0000000000000000000000000000000000000000
--- a/.appveyor.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-version: 1.0.{build}
-image:
-  - Visual Studio 2015
-  - macos
-environment:
-  matrix:
-    - ARCH: amd64
-    - ARCH: x86
-matrix:
-  exclude:
-    - image: macos
-      ARCH: x86
-for:
-  -
-    matrix:
-      only:
-        - image: Visual Studio 2015
-    clone_folder: c:\dev\TDengine
-    clone_depth: 1
-
-    init:
-      - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %ARCH%
-
-    before_build:
-      - cd c:\dev\TDengine
-      - md build
-
-    build_script:
-      - cd build
-      - cmake -G "NMake Makefiles" .. -DBUILD_JDBC=false
-      - nmake install
-  -
-    matrix:
-      only:
-        - image: macos
-    clone_depth: 1
-
-    build_script:
-      - mkdir debug
-      - cd debug
-      - cmake .. > /dev/null
-      - make > /dev/null
-notifications:
-- provider: Email
-  to:
-  - sangshuduo@gmail.com
-  on_build_success: true
-  on_build_failure: true
-  on_build_status_changed: true
diff --git a/cmake/version.inc b/cmake/version.inc
index ec6bddab00c31c832e5f64d24f40dbd712a239d7..31a930ebcd80eef3fe65567b867f553146713e88 100755
--- 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.4.0.3")
+  SET(TD_VER_NUMBER "2.4.0.4")
 ENDIF ()
 
 IF (DEFINED VERCOMPATIBLE)
diff --git a/documentation20/cn/12.taos-sql/docs.md b/documentation20/cn/12.taos-sql/docs.md
index b6bf522a9b872a04f463fad3a4885c89e8c453a3..e668cf02bd7ef65fcb6bd963860d97fe4a8eaa66 100755
--- a/documentation20/cn/12.taos-sql/docs.md
+++ b/documentation20/cn/12.taos-sql/docs.md
@@ -1801,9 +1801,9 @@ TDengine 中的表（列）名命名规则如下：
   1. 在where条件中时，支持函数match/nmatch/between and/like/and/or/is null/is no null，不支持in
 
      ```mysql 
-     select * from s1 where info→'k1' match 'v*'; 
+     select * from s1 where info->'k1' match 'v*'; 
 
-     select * from s1 where info→'k1' like 'v%' and info contains 'k2';
+     select * from s1 where info->'k1' like 'v%' and info contains 'k2';
 
      select * from s1 where info is null; 
   
@@ -1815,7 +1815,7 @@ TDengine 中的表（列）名命名规则如下：
   3. 支持distinct操作.
 
      ```mysql 
-     select distinct info→'k1' from s1
+     select distinct info->'k1' from s1
      ```
   
   5. 标签操作
@@ -1846,7 +1846,7 @@ TDengine 中的表（列）名命名规则如下：
   
      比如暂不支持 
      ```mysql 
-     select jtag→'key' from (select jtag from stable)
+     select jtag->'key' from (select jtag from stable)
      ```
   
      不支持 
diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index 053d806022124732e3009c2a16f2bfd5d5def9c7..4f847f949a25e157261cc42b20ece0c9072e328f 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -11,12 +11,16 @@ RUN tar -zxf ${pkgFile}
 WORKDIR /root/${dirName}/
 RUN /bin/bash install.sh -e no
 
-RUN apt-get clean && apt-get update && apt-get install -y locales && locale-gen en_US.UTF-8
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get clean && apt-get update && apt-get install -y locales tzdata netcat && locale-gen en_US.UTF-8
 ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib" \
     LC_CTYPE=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     LC_ALL=en_US.UTF-8
 
-EXPOSE 6030 6031 6032 6033 6034 6035 6036 6037 6038 6039 6040 6041 6042
+EXPOSE 6030-6049
+EXPOSE 6030-6039/udp
+COPY ./bin/* /usr/bin/
+ENTRYPOINT ["/usr/bin/entrypoint.sh"]
 CMD ["taosd"]
-VOLUME [ "/var/lib/taos", "/var/log/taos","/etc/taos/" ]
+VOLUME [ "/var/lib/taos", "/var/log/taos", "/corefile" ]
diff --git a/packaging/docker/README.md b/packaging/docker/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..e41182f471050af6b4d47b696eb237e319b2dd80
--- /dev/null
+++ b/packaging/docker/README.md
@@ -0,0 +1,664 @@
+# TDengine Docker Image Quick Reference
+
+## What is TDengine?
+
+TDengine is an open-sourced big data platform under [GNU AGPL v3.0](http://www.gnu.org/licenses/agpl-3.0.html), designed and optimized for the Internet of Things (IoT), Connected Cars, Industrial IoT, and IT Infrastructure and Application Monitoring. Besides the 10x faster time-series database, it provides caching, stream computing, message queuing and other functionalities to reduce the complexity and cost of development and operation.
+
+- **10x Faster on Insert/Query Speeds**: Through the innovative design on storage, on a single-core machine, over 20K requests can be processed, millions of data points can be ingested, and over 10 million data points can be retrieved in a second. It is 10 times faster than other databases.
+
+- **1/5 Hardware/Cloud Service Costs**: Compared with typical big data solutions, less than 1/5 of computing resources are required. Via column-based storage and tuned compression algorithms for different data types, less than 1/10 of storage space is needed.
+
+- **Full Stack for Time-Series Data**: By integrating a database with message queuing, caching, and stream computing features together, it is no longer necessary to integrate Kafka/Redis/HBase/Spark or other software. It makes the system architecture much simpler and more robust.
+
+- **Powerful Data Analysis**: Whether it is 10 years or one minute ago, data can be queried just by specifying the time range. Data can be aggregated over time, multiple time streams or both. Ad Hoc queries or analyses can be executed via TDengine shell, Python, R or Matlab.
+
+- **Seamless Integration with Other Tools**: Telegraf, Grafana, Matlab, R, and other tools can be integrated with TDengine without a line of code. MQTT, OPC, Hadoop, Spark, and many others will be integrated soon.
+
+- **Zero Management, No Learning Curve**: It takes only seconds to download, install, and run it successfully; there are no other dependencies. Automatic partitioning on tables or DBs. Standard SQL is used, with C/C++, Python, JDBC, Go and RESTful connectors.
+
+## How to use this image
+
+### Start a TDengine instance with RESTful API exposed
+
+Simply, you can use `docker run` to start a TDengine instance and connect it with restful connectors(eg. [JDBC-RESTful](https://www.taosdata.com/cn/documentation/connector/java)).
+
+```bash
+docker run -d --name tdengine -p 6041:6041 tdengine/tdengine
+```
+
+This command starts a docker container by name `tdengine` with TDengine server running, and maps the container's HTTP port 6041 to the host's port 6041. If you have `curl` in your host, you can list the databases by the command:
+
+```bash
+curl -u root:taosdata -d "show databases" localhost:6041/rest/sql
+```
+
+You can execute the `taos` shell command in the container:
+
+```bash
+$ docker exec -it tdengine taos
+
+Welcome to the TDengine shell from Linux, Client Version:2.4.0.0
+Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.
+
+taos> show databases;
+              name              |      created_time       |   ntables   |   vgroups   | replica | quorum |  days  |           keep           |  cache(MB)  |   blocks    |   minrows   |   maxrows   | wallevel |    fsync    | comp | cachelast | precision | update |   status   |
+====================================================================================================================================================================================================================================================================================
+ log                            | 2022-01-17 13:57:22.270 |          10 |           1 |       1 |      1 |     10 | 30                       |           1 |           3 |         100 |        4096 |        1 |        3000 |    2 |         0 | us        |      0 | ready      |
+Query OK, 1 row(s) in set (0.002843s)
+```
+
+Since TDengine use container hostname to establish connections, it's a bit more complex to use taos shell and native connectors(such as JDBC-JNI) with TDengine container instance. This is the recommended way to expose ports and use TDengine with docker in simple cases. If you want to use taos shell or taosc/connectors smoothly outside the `tdengine` container, see next use cases that match you need.
+
+### Start with host network
+
+```bash
+docker run -d --name tdengine --network host tdengine/tdengine
+```
+
+Starts container with `host` network will use host's hostname as fqdn instead of container id. It's much like starting natively with `systemd` in host. After installing the client, you can use `taos` shell as normal in host path.
+
+```bash
+$ taos
+
+Welcome to the TDengine shell from Linux, Client Version:2.4.0.0
+Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.
+
+taos> show dnodes;
+   id   |           end_point            | vnodes | cores  |   status   | role  |       create_time       |      offline reason      |
+======================================================================================================================================
+      1 | host:6030           |      1 |      8 | ready      | any   | 2022-01-17 22:10:32.619 |                          |
+Query OK, 1 row(s) in set (0.003233s)
+```
+
+### Start with exposed ports and specified hostname
+
+Set the fqdn explicitly will help you to use in other environment or applications. We provide environment variable `TAOS_FQDN` or `fqdn` config option to explicitly set the hostname used by TDengine container instance(s).
+
+Use `TAOS_FQDN` variable within `docker run` command:
+
+```bash
+docker run -d \
+   --name tdengine \
+   -e TAOS_FQDN=tdengine \
+   -p 6030-6049:6030-6049 \
+   -p 6030-6049:6030-6049/udp \
+   tdengine/tdengine
+```
+
+This command starts a docker container with TDengine server running and maps the container's TCP ports from 6030 to 6049 to the host's ports from 6030 to 6049 with TCP protocol and UDP ports range 6030-6039 to the host's UDP ports 6030-6039. If the host is already running TDengine server and occupying the same port(s), you need to map the container's port to a different unused port segment. (Please see TDengine 2.0 Port Description for details). In order to support TDengine clients accessing TDengine server services, both TCP and UDP ports need to be exposed by default(unless `rpcForceTcp` is set to `1`).
+
+If you want to use taos shell or native connectors([JDBC-JNI](https://www.taosdata.com/cn/documentation/connector/java), or [driver-go](https://github.com/taosdata/driver-go)), you need to make sure the `TAOS_FQDN` is resolvable at `/etc/hosts` or with custom DNS service.
+
+If you set the `TAOS_FQDN` to host's hostname, it will works as using `hosts` network like previous use case. Otherwise, like in `-e TAOS_FQDN=tdengine`, you can add the hostname record `tdengine` into `/etc/hosts` (use `127.0.0.1` here in host path, if use TDengine client/application in other hosts, you should set the right ip to the host eg. `192.168.10.1`(check the real ip in host with `hostname -i` or `ip route list default`) to make the TDengine endpoint resolvable):
+
+```bash
+echo 127.0.0.1 tdengine |sudo tee -a /etc/hosts
+```
+
+Then you can use `taos` with the host `tdengine`:
+
+```bash
+taos -h tdengine
+```
+
+Or develop/test applications with native connectors. As in python:
+
+```python
+import taos;
+conn = taos.connect(host = "tdengine")
+res = conn.query("show databases")
+for row in res.fetch_all_into_dict():
+   print(row)
+```
+
+See the results:
+
+```bash
+Python 3.8.10 (default, Nov 26 2021, 20:14:08) 
+[GCC 9.3.0] on linux
+Type "help", "copyright", "credits" or "license" for more information.
+>>> import taos;
+>>> conn = taos.connect(host = "tdengine")
+>>> res = conn.query("show databases")
+>>> for row in res.fetch_all_into_dict():
+...    print(row)
+... 
+{'name': 'log', 'created_time': datetime.datetime(2022, 1, 17, 22, 56, 2, 490000), 'ntables': 11, 'vgroups': 1, 'replica': 1, 'quorum': 1, 'days': 10, 'keep': '30', 'cache(MB)': 1, 'blocks': 3, 'minrows': 100, 'maxrows': 4096, 'wallevel': 1, 'fsync': 3000, 'comp': 2, 'cachelast': 0, 'precision': 'us', 'update': 0, 'status': 'ready'}
+```
+
+### Start with specific network
+
+Alternatively, you can use TDengine natively by using specific network.
+
+First, create network for TDengine server and client/application.
+
+```bash
+docker network create td-net
+```
+
+Start TDengine instance with service name as fqdn (explicitly set with `TAOS_FQDN`):
+
+```bash
+docker run -d --name tdengine --network td-net \
+   -e TAOS_FQDN=tdengine \
+   tdengine/tdengine
+```
+
+Start TDengine client in another container with the specific network:
+
+```bash
+docker run --rm -it --network td-net -e TAOS_FIRST_EP=tdengine tdengine/tdengine taos
+# or
+docker run --rm -it --network td-net -e tdengine/tdengine taos -h tdengine
+```
+
+When you build your application with docker, you should add the TDengine client in the dockerfile, as based on `ubuntu:20.04` image, install the client like this:
+
+```dockerfile
+FROM ubuntu:20.04
+RUN apt-get update && apt-get install -y wget
+ENV TDENGINE_VERSION=2.4.0.0
+RUN wget -c https://www.taosdata.com/assets-download/TDengine-client-${TDENGINE_VERSION}-Linux-x64.tar.gz \
+   && tar xvf TDengine-client-${TDENGINE_VERSION}-Linux-x64.tar.gz \
+   && cd TDengine-client-${TDENGINE_VERSION} \
+   && ./install_client.sh \
+   && cd ../ \
+   && rm -rf TDengine-client-${TDENGINE_VERSION}-Linux-x64.tar.gz TDengine-client-${TDENGINE_VERSION}
+## add your application next, eg. go, build it in builder stage, copy the binary to the runtime
+#COPY --from=builder /path/to/build/app /usr/bin/
+#CMD ["app"]
+```
+
+Here is an Go example app:
+
+<!-- code-spell-checker:disable -->
+<!-- markdownlint-disable MD010 -->
+
+```go
+/*
+ * In this test program, we'll create a database and insert 4 records then select out.
+ */
+package main
+
+import (
+	"database/sql"
+	"flag"
+	"fmt"
+	"time"
+
+	_ "github.com/taosdata/driver-go/v2/taosSql"
+)
+
+type config struct {
+	hostName   string
+	serverPort string
+	user       string
+	password   string
+}
+
+var configPara config
+var taosDriverName = "taosSql"
+var url string
+
+func init() {
+	flag.StringVar(&configPara.hostName, "h", "", "The host to connect to TDengine server.")
+	flag.StringVar(&configPara.serverPort, "p", "", "The TCP/IP port number to use for the connection to TDengine server.")
+	flag.StringVar(&configPara.user, "u", "root", "The TDengine user name to use when connecting to the server.")
+	flag.StringVar(&configPara.password, "P", "taosdata", "The password to use when connecting to the server.")
+	flag.Parse()
+}
+
+func printAllArgs() {
+	fmt.Printf("============= args parse result: =============\n")
+	fmt.Printf("hostName:             %v\n", configPara.hostName)
+	fmt.Printf("serverPort:           %v\n", configPara.serverPort)
+	fmt.Printf("usr:                  %v\n", configPara.user)
+	fmt.Printf("password:             %v\n", configPara.password)
+	fmt.Printf("================================================\n")
+}
+
+func main() {
+	printAllArgs()
+
+	url = "root:taosdata@/tcp(" + configPara.hostName + ":" + configPara.serverPort + ")/"
+
+	taos, err := sql.Open(taosDriverName, url)
+	checkErr(err, "open database error")
+	defer taos.Close()
+
+	taos.Exec("create database if not exists test")
+	taos.Exec("use test")
+	taos.Exec("create table if not exists tb1 (ts timestamp, a int)")
+	_, err = taos.Exec("insert into tb1 values(now, 0)(now+1s,1)(now+2s,2)(now+3s,3)")
+	checkErr(err, "failed to insert")
+	rows, err := taos.Query("select * from tb1")
+	checkErr(err, "failed to select")
+
+	defer rows.Close()
+	for rows.Next() {
+		var r struct {
+			ts time.Time
+			a  int
+		}
+		err := rows.Scan(&r.ts, &r.a)
+		if err != nil {
+			fmt.Println("scan error:\n", err)
+			return
+		}
+		fmt.Println(r.ts, r.a)
+	}
+}
+
+func checkErr(err error, prompt string) {
+	if err != nil {
+		fmt.Println("ERROR: %s\n", prompt)
+		panic(err)
+	}
+}
+```
+
+<!-- markdownlint-enable MD010 -->
+<!-- code-spell-checker:enable -->
+
+Full version of dockerfile could be:
+
+```dockerfile
+FROM golang:1.17.6-buster as builder
+ENV TDENGINE_VERSION=2.4.0.0
+RUN wget -c https://www.taosdata.com/assets-download/TDengine-client-${TDENGINE_VERSION}-Linux-x64.tar.gz \
+   && tar xvf TDengine-client-${TDENGINE_VERSION}-Linux-x64.tar.gz \
+   && cd TDengine-client-${TDENGINE_VERSION} \
+   && ./install_client.sh \
+   && cd ../ \
+   && rm -rf TDengine-client-${TDENGINE_VERSION}-Linux-x64.tar.gz TDengine-client-${TDENGINE_VERSION}
+WORKDIR /usr/src/app/
+ENV GOPROXY="https://goproxy.io,direct"
+COPY ./main.go ./go.mod ./go.sum /usr/src/app/
+RUN go env && go mod tidy && go build
+
+FROM ubuntu:20.04
+RUN apt-get update && apt-get install -y wget
+ENV TDENGINE_VERSION=2.4.0.0
+RUN wget -c https://www.taosdata.com/assets-download/TDengine-client-${TDENGINE_VERSION}-Linux-x64.tar.gz \
+   && tar xvf TDengine-client-${TDENGINE_VERSION}-Linux-x64.tar.gz \
+   && cd TDengine-client-${TDENGINE_VERSION} \
+   && ./install_client.sh \
+   && cd ../ \
+   && rm -rf TDengine-client-${TDENGINE_VERSION}-Linux-x64.tar.gz TDengine-client-${TDENGINE_VERSION}
+
+## add your application next, eg. go, build it in builder stage, copy the binary to the runtime
+COPY --from=builder /usr/src/app/app /usr/bin/
+CMD ["app"]
+```
+
+Suppose you have `main.go`, `go.mod` `go.sum`, `app.dockerfile`, build the app and run it with network `td-net`:
+
+```bash
+$ docker build -t app -f app.dockerfile
+$ docker run --rm --network td-net app -h tdengine -p 6030
+============= args parse result: =============
+hostName:             tdengine
+serverPort:           6030
+usr:                  root
+password:             taosdata
+================================================
+2022-01-17 15:56:55.48 +0000 UTC 0
+2022-01-17 15:56:56.48 +0000 UTC 1
+2022-01-17 15:56:57.48 +0000 UTC 2
+2022-01-17 15:56:58.48 +0000 UTC 3
+2022-01-17 15:58:01.842 +0000 UTC 0
+2022-01-17 15:58:02.842 +0000 UTC 1
+2022-01-17 15:58:03.842 +0000 UTC 2
+2022-01-17 15:58:04.842 +0000 UTC 3
+2022-01-18 01:43:48.029 +0000 UTC 0
+2022-01-18 01:43:49.029 +0000 UTC 1
+2022-01-18 01:43:50.029 +0000 UTC 2
+2022-01-18 01:43:51.029 +0000 UTC 3
+```
+
+Now you must be much familiar with developing and testing with TDengine, let's see some more complex cases.
+
+### Start with docker-compose with multiple nodes(instances)
+
+Start a 2-replicas-2-mnodes-2-dnodes-1-arbitrator TDengine cluster with `docker-compose` is quite simple. Save the file as `docker-compose.yml`:
+
+```yaml
+version: "3"
+services:
+  arbitrator:
+    image: tdengine/tdengine:$VERSION
+    command: tarbitrator
+  td-1:
+    image: tdengine/tdengine:$VERSION
+    environment:
+      TAOS_FQDN: "td-1"
+      TAOS_FIRST_EP: "td-1"
+      TAOS_NUM_OF_MNODES: "2"
+      TAOS_REPLICA: "2"
+      TAOS_ARBITRATOR: arbitrator:6042
+    volumes:
+      - taosdata-td1:/var/lib/taos/
+      - taoslog-td1:/var/log/taos/
+  td-2:
+    image: tdengine/tdengine:$VERSION
+    environment:
+      TAOS_FQDN: "td-2"
+      TAOS_FIRST_EP: "td-1"
+      TAOS_NUM_OF_MNODES: "2"
+      TAOS_REPLICA: "2"
+      TAOS_ARBITRATOR: arbitrator:6042
+    volumes:
+      - taosdata-td2:/var/lib/taos/
+      - taoslog-td2:/var/log/taos/
+volumes:
+  taosdata-td1:
+  taoslog-td1:
+  taosdata-td2:
+  taoslog-td2:
+```
+
+You may notice that:
+
+- We use `VERSION` environment variable to set `tdengine` image tag version once.
+- **`TAOS_FIRST_EP`** **MUST** be set to join the newly created instances into an existing TDengine cluster. If you want more instances, use `TAOS_SECOND_EP` in case of HA(High Availability) concerns.
+- `TAOS_NUM_OF_MNODES` is for setting number of mnodes for the cluster.
+- `TAOS_REPLICA` set the default database replicas, `2` means there're one master and one slave copy of data. The `replica` option should be `1 <= replica <= 3`, and not greater than dnodes number.
+- `TAOS_ARBITRATOR` set the arbitrator entrypoint of the cluster for failover/election stuff. It's better to use arbitrator in a two nodes cluster.
+- The way to start an arbitrator service is as easy as abc: just add command name `tarbitrator`(which is the binary name of arbitrator daemon) in docker-compose service option: `command: tarbitrator`, and everything is ok now.
+
+Now run `docker-compose up -d` with version specified:
+
+```bash
+$ VERSION=2.4.0.0 docker-compose up -d
+Creating network "test_default" with the default driver
+Creating volume "test_taosdata-td1" with default driver
+Creating volume "test_taoslog-td1" with default driver
+Creating volume "test_taosdata-td2" with default driver
+Creating volume "test_taoslog-td2" with default driver
+Creating test_td-1_1       ... done
+Creating test_arbitrator_1 ... done
+Creating test_td-2_1       ... done
+```
+
+Check the status:
+
+```bash
+$ docker-compose ps
+      Name                     Command               State                                                                Ports                                                              
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+test_arbitrator_1   /usr/bin/entrypoint.sh tar ...   Up      6030/tcp, 6031/tcp, 6032/tcp, 6033/tcp, 6034/tcp, 6035/tcp, 6036/tcp, 6037/tcp, 6038/tcp, 6039/tcp, 6040/tcp, 6041/tcp, 6042/tcp
+test_td-1_1         /usr/bin/entrypoint.sh taosd     Up      6030/tcp, 6031/tcp, 6032/tcp, 6033/tcp, 6034/tcp, 6035/tcp, 6036/tcp, 6037/tcp, 6038/tcp, 6039/tcp, 6040/tcp, 6041/tcp, 6042/tcp
+test_td-2_1         /usr/bin/entrypoint.sh taosd     Up      6030/tcp, 6031/tcp, 6032/tcp, 6033/tcp, 6034/tcp, 6035/tcp, 6036/tcp, 6037/tcp, 6038/tcp, 6039/tcp, 6040/tcp, 6041/tcp, 6042/tcp
+```
+
+Check dnodes with taos shell:
+
+```bash
+$ docker-compose exec td-1 taos -s "show dnodes"
+
+Welcome to the TDengine shell from Linux, Client Version:2.4.0.0
+Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.
+
+taos> show dnodes
+   id   |           end_point            | vnodes | cores  |   status   | role  |       create_time       |      offline reason      |
+======================================================================================================================================
+      1 | td-1:6030                      |      1 |      8 | ready      | any   | 2022-01-18 02:47:42.871 |                          |
+      2 | td-2:6030                      |      0 |      8 | ready      | any   | 2022-01-18 02:47:43.518 |                          |
+      0 | arbitrator:6042                |      0 |      0 | ready      | arb   | 2022-01-18 02:47:43.633 | -                        |
+Query OK, 3 row(s) in set (0.000811s)
+```
+
+### Start a TDengine cluster with scaled taosadapter service
+
+In previous use case, you could see the way to start other services built with TDengine(`taosd` as the default command). There's another important service you should know:
+
+> **taosAdapter** is a TDengine’s companion tool and is a bridge/adapter between TDengine cluster and application. It provides an easy-to-use and efficient way to ingest data from data collections agents(like Telegraf, StatsD, CollectD) directly. It also provides InfluxDB/OpenTSDB compatible data ingestion interface to allow InfluxDB/OpenTSDB applications to immigrate to TDengine seamlessly.
+
+`taosadapter` is running inside `tdengine` image by default, you can disable it by `TAOS_DISABLE_ADAPTER=true`. Running `taosadapter` in a separate container is like how `arbitrator` does:
+
+```yaml
+services:
+  # ...
+  adapter:
+    image: tdengine/tdengine:$VERSION
+    command: taosadapter
+```
+
+`taosadapter` could be scaled with docker-compose, so that you can manage the `taosadapter` nodes easily. Here is an example shows 4-`taosadapter` instances in a TDengine cluster(much like previous use cases):
+
+```yaml
+version: "3"
+
+networks:
+  inter:
+  api:
+
+services:
+  arbitrator:
+    image: tdengine/tdengine:$VERSION
+    command: tarbitrator
+    networks:
+      - inter
+  td-1:
+    image: tdengine/tdengine:$VERSION
+    networks:
+      - inter
+    environment:
+      TAOS_FQDN: "td-1"
+      TAOS_FIRST_EP: "td-1"
+      TAOS_NUM_OF_MNODES: "2"
+      TAOS_REPLICA: "2"
+      TAOS_ARBITRATOR: arbitrator:6042
+    volumes:
+      - taosdata-td1:/var/lib/taos/
+      - taoslog-td1:/var/log/taos/
+  td-2:
+    image: tdengine/tdengine:$VERSION
+    networks:
+      - inter
+    environment:
+      TAOS_FQDN: "td-2"
+      TAOS_FIRST_EP: "td-1"
+      TAOS_NUM_OF_MNODES: "2"
+      TAOS_REPLICA: "2"
+      TAOS_ARBITRATOR: arbitrator:6042
+    volumes:
+      - taosdata-td2:/var/lib/taos/
+      - taoslog-td2:/var/log/taos/
+  adapter:
+    image: tdengine/tdengine:$VERSION
+    command: taosadapter
+    networks:
+      - inter
+    environment:
+      TAOS_FIRST_EP: "td-1"
+      TAOS_SECOND_EP: "td-2"
+    deploy:
+      replicas: 4
+  nginx:
+    image: nginx
+    depends_on:
+      - adapter
+    networks:
+      - inter
+      - api
+    ports:
+      - 6041:6041
+      - 6044:6044/udp
+    command: [
+        "sh",
+        "-c",
+        "while true;
+        do curl -s http://adapter:6041/-/ping >/dev/null && break;
+        done;
+        printf 'server{listen 6041;location /{proxy_pass http://adapter:6041;}}'
+        > /etc/nginx/conf.d/rest.conf;
+        printf 'stream{server{listen 6044 udp;proxy_pass adapter:6044;}}'
+        >> /etc/nginx/nginx.conf;cat /etc/nginx/nginx.conf;
+        nginx -g 'daemon off;'",
+      ]
+volumes:
+  taosdata-td1:
+  taoslog-td1:
+  taosdata-td2:
+  taoslog-td2:
+```
+
+Start the cluster:
+
+```bash
+$ VERSION=2.4.0.0 docker-compose up -d
+Creating network "docker_inter" with the default driver
+Creating network "docker_api" with the default driver
+Creating volume "docker_taosdata-td1" with default driver
+Creating volume "docker_taoslog-td1" with default driver
+Creating volume "docker_taosdata-td2" with default driver
+Creating volume "docker_taoslog-td2" with default driver
+Creating docker_td-2_1       ... done
+Creating docker_arbitrator_1 ... done
+Creating docker_td-1_1       ... done
+Creating docker_adapter_1    ... done
+Creating docker_adapter_2    ... done
+Creating docker_adapter_3    ... done
+```
+
+It will start a TDengine cluster with two dnodes and four taosadapter instances, expose ports 6041/tcp and 6044/udp to host.
+
+`6041` is the RESTful API endpoint port, you can verify that the RESTful interface taosAdapter provides working using the `curl` command.
+
+```bash
+$ curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'show databases;' 127.0.0.1:6041/rest/sql
+{"status":"succ","head":["name","created_time","ntables","vgroups","replica","quorum","days","keep","cache(MB)","blocks","minrows","maxrows","wallevel","fsync","comp","cachelast","precision","update","status"],"column_meta":[["name",8,32],["created_time",9,8],["ntables",4,4],["vgroups",4,4],["replica",3,2],["quorum",3,2],["days",3,2],["keep",8,24],["cache(MB)",4,4],["blocks",4,4],["minrows",4,4],["maxrows",4,4],["wallevel",2,1],["fsync",4,4],["comp",2,1],["cachelast",2,1],["precision",8,3],["update",2,1],["status",8,10]],"data":[["log","2022-01-18 04:37:42.902",16,1,1,1,10,"30",1,3,100,4096,1,3000,2,0,"us",0,"ready"]],"rows":1}
+```
+
+If you run curl in batch(here we use [hyperfine](https://github.com/sharkdp/hyperfine) - a command-line benchmarking tool), the requests are balanced into 4 adapter instances.
+
+```bash
+hyperfine -m10 'curl -u root:taosdata localhost:6041/rest/sql -d "describe log.log"'
+```
+
+View the logs with `docker-compose logs`:
+
+```bash
+$ docker-compose logs adapter
+# some logs skipped
+adapter_2     | 01/18 04:57:44.616529 00000039 TAOS_ADAPTER info "| 200 |     162.185µs |      172.21.0.9 | POST | /rest/sql " model=web sessionID=18
+adapter_1     | 01/18 04:57:44.627695 00000039 TAOS_ADAPTER info "| 200 |     145.485µs |      172.21.0.9 | POST | /rest/sql " model=web sessionID=17
+adapter_3     | 01/18 04:57:44.639165 00000040 TAOS_ADAPTER info "| 200 |     146.913µs |      172.21.0.9 | POST | /rest/sql " sessionID=17 model=web
+adapter_4     | 01/18 04:57:44.650829 00000039 TAOS_ADAPTER info "| 200 |     153.201µs |      172.21.0.9 | POST | /rest/sql " sessionID=17 model=web
+adapter_2     | 01/18 04:57:44.662422 00000039 TAOS_ADAPTER info "| 200 |     211.393µs |      172.21.0.9 | POST | /rest/sql " model=web sessionID=19
+adapter_1     | 01/18 04:57:44.673426 00000039 TAOS_ADAPTER info "| 200 |     154.714µs |      172.21.0.9 | POST | /rest/sql " model=web sessionID=18
+adapter_3     | 01/18 04:57:44.684788 00000040 TAOS_ADAPTER info "| 200 |     131.876µs |      172.21.0.9 | POST | /rest/sql " model=web sessionID=18
+adapter_4     | 01/18 04:57:44.696261 00000039 TAOS_ADAPTER info "| 200 |     162.173µs |      172.21.0.9 | POST | /rest/sql " model=web sessionID=18
+adapter_2     | 01/18 04:57:44.707414 00000039 TAOS_ADAPTER info "| 200 |     164.419µs |      172.21.0.9 | POST | /rest/sql " model=web sessionID=20
+adapter_1     | 01/18 04:57:44.720842 00000039 TAOS_ADAPTER info "| 200 |     179.374µs |      172.21.0.9 | POST | /rest/sql " model=web sessionID=19
+adapter_3     | 01/18 04:57:44.732184 00000040 TAOS_ADAPTER info "| 200 |     141.174µs |      172.21.0.9 | POST | /rest/sql " sessionID=19 model=web
+adapter_4     | 01/18 04:57:44.744024 00000039 TAOS_ADAPTER info "| 200 |     159.774µs |      172.21.0.9 | POST | /rest/sql " model=web sessionID=19
+adapter_2     | 01/18 04:57:44.773732 00000039 TAOS_ADAPTER info "| 200 |     178.993µs |      172.21.0.9 | POST | /rest/sql " model=web sessionID=21
+adapter_1     | 01/18 04:57:44.796518 00000039 TAOS_ADAPTER info "| 200 |      238.24µs |      172.21.0.9 | POST | /rest/sql " model=web sessionID=20
+adapter_3     | 01/18 04:57:44.810744 00000040 TAOS_ADAPTER info "| 200 |     176.133µs |      172.21.0.9 | POST | /rest/sql " model=web sessionID=20
+adapter_4     | 01/18 04:57:44.826395 00000039 TAOS_ADAPTER info "| 200 |     149.215µs |      172.21.0.9 | POST | /rest/sql " model=web sessionID=20
+```
+
+`6044/udp` is the [StatsD](https://github.com/statsd/statsd)-compatible port, you can verify this feature with `nc` command(usually provided by `netcat` package).
+
+```bash
+echo "foo:1|c" | nc -u -w0 127.0.0.1 6044
+```
+
+Check the result in `taos` shell with `docker-compose exec`:
+
+```bash
+$ dc exec td-1 taos
+
+Welcome to the TDengine shell from Linux, Client Version:2.4.0.0
+Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.
+
+taos> show databases;
+              name              |      created_time       |   ntables   |   vgroups   | replica | quorum |  days  |           keep           |  cache(MB)  |   blocks    |   minrows   |   maxrows   | wallevel |    fsync    | comp | cachelast | precision | update |   status   |
+====================================================================================================================================================================================================================================================================================
+ log                            | 2022-01-18 04:37:42.902 |          17 |           1 |       1 |      1 |     10 | 30                       |           1 |           3 |         100 |        4096 |        1 |        3000 |    2 |         0 | us        |      0 | ready      |
+ statsd                         | 2022-01-18 04:45:02.563 |           1 |           1 |       2 |      1 |     10 | 3650                     |          16 |           6 |         100 |        4096 |        1 |        3000 |    2 |         0 | ns        |      2 | ready      |
+Query OK, 2 row(s) in set (0.001838s)
+
+taos> select * from statsd.foo;
+              ts               |         value         |         metric_type          |
+=======================================================================================
+ 2022-01-18 04:45:02.563422822 |                     1 | counter                      |
+Query OK, 1 row(s) in set (0.003854s)
+```
+
+Use `docker-compose up -d adapter=1 to reduce the instances to 1
+
+### Deploy TDengine cluster in Docker Swarm with `docker-compose.yml`
+
+If you use docker swarm mode, it will schedule arbitrator/taosd/taosadapter services into different hosts automatically. If you've no experience with k8s/kubernetes, this is the most convenient way to scale out the TDengine cluster with multiple hosts/servers.
+
+Use the `docker-compose.yml` file in previous use case, and deploy with `docker stack` or `docker deploy`:
+
+```bash
+$ VERSION=2.4.0 docker stack deploy -c docker-compose.yml taos
+Creating network taos_inter
+Creating network taos_api
+Creating service taos_arbitrator
+Creating service taos_td-1
+Creating service taos_td-2
+Creating service taos_adapter
+Creating service taos_nginx
+```
+
+Now you've created a TDengine cluster with multiple host servers.
+
+Use `docker service` or `docker stack` to manage the cluster:
+
+<!-- code-spell-checker:disable -->
+
+```bash
+$ docker stack ps taos
+ID                  NAME                IMAGE                     NODE                DESIRED STATE       CURRENT STATE                ERROR               PORTS
+79ni8temw59n        taos_nginx.1        nginx:latest              TM1701     Running             Running about a minute ago                       
+3e94u72msiyg        taos_adapter.1      tdengine/tdengine:2.4.0   TM1702     Running             Running 56 seconds ago                           
+100amjkwzsc6        taos_td-2.1         tdengine/tdengine:2.4.0   TM1703     Running             Running about a minute ago                       
+pkjehr2vvaaa        taos_td-1.1         tdengine/tdengine:2.4.0   TM1704     Running             Running 2 minutes ago                            
+tpzvgpsr1qkt        taos_arbitrator.1   tdengine/tdengine:2.4.0   TM1705     Running             Running 2 minutes ago                            
+rvss3g5yg6fa        taos_adapter.2      tdengine/tdengine:2.4.0   TM1706     Running             Running 56 seconds ago                           
+i2augxamfllf        taos_adapter.3      tdengine/tdengine:2.4.0   TM1707     Running             Running 56 seconds ago                           
+lmjyhzccpvpg        taos_adapter.4      tdengine/tdengine:2.4.0   TM1708     Running             Running 56 seconds ago
+$ docker service ls
+ID                  NAME                MODE                REPLICAS            IMAGE                     PORTS
+561t4lu6nfw6        taos_adapter        replicated          4/4                 tdengine/tdengine:2.4.0   
+3hk5ct3q90sm        taos_arbitrator     replicated          1/1                 tdengine/tdengine:2.4.0   
+d8qr52envqzu        taos_nginx          replicated          1/1                 nginx:latest              *:6041->6041/tcp, *:6044->6044/udp
+2isssfvjk747        taos_td-1           replicated          1/1                 tdengine/tdengine:2.4.0   
+9pzw7u02ichv        taos_td-2           replicated          1/1                 tdengine/tdengine:2.4.0
+```
+
+<!-- code-spell-checker:enable -->
+
+It shows that there are two dnodes, one arbitrator, four taosadapter and one nginx reverse-forward service in this cluster.
+
+You can scale down the taosadapter replicas to `1` by `docker service`:
+
+```bash
+$ docker service scale taos_adapter=1
+taos_adapter scaled to 1
+overall progress: 1 out of 1 tasks 
+1/1: running   [==================================================>] 
+verify: Service converged
+
+$ docker service ls -f name=taos_adapter
+ID                  NAME                MODE                REPLICAS            IMAGE                     PORTS
+561t4lu6nfw6        taos_adapter        replicated          1/1                 tdengine/tdengine:2.4.0
+```
+
+Now it remains only 1 taosadapter instance in the cluster.
+
+When you want to remove the cluster, just type:
+
+```bash
+docker stack rm taos
+```
+
+### Environment Variables
+
+When you start `tdengine` image, you can adjust the configuration of TDengine by passing environment variables on the `docker run` command line or in the docker compose file. You can use all of the environment variables that passed to taosd or taosadapter.
diff --git a/packaging/docker/bin/entrypoint.sh b/packaging/docker/bin/entrypoint.sh
new file mode 100755
index 0000000000000000000000000000000000000000..5fb441004d8b454de1039eb3f4b23eb51f32be64
--- /dev/null
+++ b/packaging/docker/bin/entrypoint.sh
@@ -0,0 +1,83 @@
+#!/bin/sh
+set -e
+# for TZ awareness
+if [ "$TZ" != "" ]; then
+    ln -sf /usr/share/zoneinfo/$TZ /etc/localtime
+    echo $TZ >/etc/timezone
+fi
+
+# option to disable taosadapter, default is no
+DISABLE_ADAPTER=${TAOS_DISABLE_ADAPTER:-0}
+unset TAOS_DISABLE_ADAPTER
+
+# to get mnodeEpSet from data dir
+DATA_DIR=${TAOS_DATA_DIR:-/var/lib/taos}
+
+# append env to custom taos.cfg
+CFG_DIR=/tmp/taos
+CFG_FILE=$CFG_DIR/taos.cfg
+
+mkdir -p $CFG_DIR >/dev/null 2>&1
+
+[ -f /etc/taos/taos.cfg ] && cat /etc/taos/taos.cfg | grep -E -v "^#|^\s*$" >$CFG_FILE
+env-to-cfg >>$CFG_FILE
+
+FQDN=$(cat $CFG_FILE | grep -E -v "^#|^$" | grep fqdn | tail -n1 | sed -E 's/.*fqdn\s+//')
+
+# ensure the fqdn is resolved as localhost
+grep "$FQDN" /etc/hosts >/dev/null || echo "127.0.0.1 $FQDN" >>/etc/hosts
+
+# parse first ep host and port
+FIRST_EP_HOST=${TAOS_FIRST_EP%:*}
+FIRST_EP_PORT=${TAOS_FIRST_EP#*:}
+
+# in case of custom server port
+SERVER_PORT=$(cat $CFG_FILE | grep -E -v "^#|^$" | grep serverPort | tail -n1 | sed -E 's/.*serverPort\s+//')
+SERVER_PORT=${SERVER_PORT:-6030}
+
+# for other binaries like interpreters
+if echo $1 | grep -E "taosd$" - >/dev/null; then
+    true # will run taosd
+else
+    cp -f $CFG_FILE /etc/taos/taos.cfg || true
+    $@
+    exit $?
+fi
+
+set +e
+ulimit -c unlimited
+# set core files pattern, maybe failed
+sysctl -w kernel.core_pattern=/corefile/core-$FQDN-%e-%p >/dev/null >&1
+set -e
+
+if [ "$DISABLE_ADAPTER" = "0" ]; then
+    which taosadapter >/dev/null && taosadapter &
+    # wait for 6041 port ready
+    for _ in $(seq 1 20); do
+        nc -z localhost 6041 && break
+        sleep 0.5
+    done
+fi
+
+# if has mnode ep set or the host is first ep or not for cluster, just start.
+if [ -f "$DATA_DIR/dnode/mnodeEpSet.json" ] ||
+    [ "$TAOS_FQDN" = "$FIRST_EP_HOST" ]; then
+    $@ -c $CFG_DIR
+# others will first wait the first ep ready.
+else
+    if [ "$TAOS_FIRST_EP" = "" ]; then
+        echo "run TDengine with single node."
+        $@ -c $CFG_DIR
+        exit $?
+    fi
+    while true; do
+        es=0
+        taos -h $FIRST_EP_HOST -P $FIRST_EP_PORT -n startup >/dev/null || es=$?
+        if [ "$es" -eq 0 ]; then
+            taos -h $FIRST_EP_HOST -P $FIRST_EP_PORT -s "create dnode \"$FQDN:$SERVER_PORT\";"
+            break
+        fi
+        sleep 1s
+    done
+    $@ -c $CFG_DIR
+fi
diff --git a/packaging/docker/bin/env-to-cfg b/packaging/docker/bin/env-to-cfg
new file mode 100755
index 0000000000000000000000000000000000000000..07be63e0a9aba74e271ccc20758cd2ab09fb44ed
--- /dev/null
+++ b/packaging/docker/bin/env-to-cfg
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+self=$0
+
+snake_to_camel_case() {
+  echo $1 | awk -F _ '{printf "%s", $1; for(i=2; i<=NF; i++) printf "%s", toupper(substr($i,1,1)) substr($i,2); print"";}'
+}
+
+if echo $1 | grep -E "^$" - >/dev/null; then
+  export |grep -E 'TAOS_.*' -o| sed 's/TAOS_//' |tr A-Z a-z | awk -F"=" '{print "name=$(""'$self' " $1"); echo $name "$2}' |sh
+else
+  snake_to_camel_case $1
+fi
diff --git a/packaging/docker/docker-compose.yml b/packaging/docker/docker-compose.yml
new file mode 100644
index 0000000000000000000000000000000000000000..301b41e7d43c2a894d866c1f0d45cf8d13328585
--- /dev/null
+++ b/packaging/docker/docker-compose.yml
@@ -0,0 +1,77 @@
+version: "3"
+
+networks:
+  inter:
+  api:
+
+services:
+  arbitrator:
+    image: tdengine/tdengine:$VERSION
+    command: tarbitrator
+    networks:
+      - inter
+  td-1:
+    image: tdengine/tdengine:$VERSION
+    networks:
+      - inter
+    environment:
+      TAOS_FQDN: "td-1"
+      TAOS_FIRST_EP: "td-1"
+      TAOS_NUM_OF_MNODES: "2"
+      TAOS_REPLICA: "2"
+      TAOS_ARBITRATOR: arbitrator:6042
+    volumes:
+      - taosdata-td1:/var/lib/taos/
+      - taoslog-td1:/var/log/taos/
+  td-2:
+    image: tdengine/tdengine:$VERSION
+    networks:
+      - inter
+    environment:
+      TAOS_FQDN: "td-2"
+      TAOS_FIRST_EP: "td-1"
+      TAOS_NUM_OF_MNODES: "2"
+      TAOS_REPLICA: "2"
+      TAOS_ARBITRATOR: arbitrator:6042
+    volumes:
+      - taosdata-td2:/var/lib/taos/
+      - taoslog-td2:/var/log/taos/
+  adapter:
+    image: tdengine/tdengine:$VERSION
+    command: taosadapter
+    networks:
+      - inter
+    environment:
+      TAOS_FIRST_EP: "td-1"
+      TOAS_SECOND_EP: "td-2"
+    deploy:
+      replicas: 4
+      update_config:
+        parallelism: 4
+  nginx:
+    image: nginx
+    depends_on:
+      - adapter
+    networks:
+      - inter
+      - api
+    ports:
+      - 6041:6041
+      - 6044:6044/udp
+    command: [
+        "sh",
+        "-c",
+        "while true;
+        do curl -s http://adapter:6041/-/ping >/dev/null && break;
+        done;
+        printf 'server{listen 6041;location /{proxy_pass http://adapter:6041;}}'
+        > /etc/nginx/conf.d/rest.conf;
+        printf 'stream{server{listen 6044 udp;proxy_pass adapter:6044;}}'
+        >> /etc/nginx/nginx.conf;cat /etc/nginx/nginx.conf;
+        nginx -g 'daemon off;'",
+      ]
+volumes:
+  taosdata-td1:
+  taoslog-td1:
+  taosdata-td2:
+  taoslog-td2:
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 46a2e77314e2ee72e3b935fbf9d7248406e773f1..2a5d379919807ebae1bf9010d657485ac7b59969 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: tdengine
 base: core20
-version: '2.4.0.3'
+version: '2.4.0.4'
 icon: snap/gui/t-dengine.svg
 summary: an open-source big data platform designed and optimized for IoT. 
 description: |
diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 1d76f522b6082f50fc226d19b346e3aacc79ba2c..c361e46dc7017330c9d8893a053bcde20c2c83e6 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -4656,7 +4656,7 @@ static int32_t validateSQLExprItemSQLFunc(SSqlCmd* pCmd, tSqlExpr* pExpr,
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t validateSQLExprItemArithmeticExpr(SSqlCmd* pCmd, tSqlExpr* pExpr, SQueryInfo* pQueryInfo, SColumnList* pList,
+static int32_t validateSQLExprItemOperatorExpr(SSqlCmd* pCmd, tSqlExpr* pExpr, SQueryInfo* pQueryInfo, SColumnList* pList,
                                       int32_t* type, uint64_t* uid, int32_t* height) {
   uint64_t uidLeft = 0;
   uint64_t uidRight = 0;
@@ -4685,7 +4685,9 @@ static int32_t validateSQLExprItemArithmeticExpr(SSqlCmd* pCmd, tSqlExpr* pExpr,
 
   *height = (leftHeight > rightHeight) ? leftHeight + 1 : rightHeight+1;
   {
-    assert(leftType != SQLEXPR_TYPE_UNASSIGNED && rightType != SQLEXPR_TYPE_UNASSIGNED);
+    if (leftType == SQLEXPR_TYPE_UNASSIGNED || rightType == SQLEXPR_TYPE_UNASSIGNED) {
+      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), "invalid operand expression");
+    }
 
     // return invalid operation when one child aggregate and the other child scalar or column
     if ((leftType == SQLEXPR_TYPE_AGG && rightType == SQLEXPR_TYPE_SCALAR) || (rightType == SQLEXPR_TYPE_AGG && leftType == SQLEXPR_TYPE_SCALAR)) {
@@ -4713,6 +4715,11 @@ static int32_t validateSQLExprItemArithmeticExpr(SSqlCmd* pCmd, tSqlExpr* pExpr,
           rightType == SQLEXPR_TYPE_AGG || rightType == SQLEXPR_TYPE_SCALAR) {
         return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg4);
       }
+    } else if (pExpr->tokenId == TK_ISNULL || pExpr->tokenId == TK_NOTNULL ||
+               pExpr->tokenId == TK_IS || pExpr->tokenId == TK_LIKE ||
+               pExpr->tokenId == TK_MATCH || pExpr->tokenId == TK_NMATCH ||
+               pExpr->tokenId == TK_CONTAINS || pExpr->tokenId == TK_IN) {
+        return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), "unsupported filtering operations");
     }
   }
   return TSDB_CODE_SUCCESS;
@@ -4728,7 +4735,7 @@ static int32_t validateSQLExprItem(SSqlCmd* pCmd, tSqlExpr* pExpr,
     return TSDB_CODE_SUCCESS;
   }
   if (pExpr->type == SQL_NODE_EXPR) {
-    int32_t ret = validateSQLExprItemArithmeticExpr(pCmd, pExpr, pQueryInfo, pList, type, uid, height);
+    int32_t ret = validateSQLExprItemOperatorExpr(pCmd, pExpr, pQueryInfo, pList, type, uid, height);
     if (ret != TSDB_CODE_SUCCESS) {
       return ret;
     }
diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index 2a60448a3ea9da64db55062d2e1042db594d77f6..41011056688f51e4ec1227ab4c556cd6b4448b38 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -213,8 +213,8 @@ TAOS *taos_connect_internal(const char *ip, const char *user, const char *pass,
     tscDebug("%p DB connection is opening, rpcObj: %p, dnodeConn:%p", pObj, pObj->pRpcObj, pObj->pRpcObj->pDnodeConn);
     taos_free_result(pSql);
   
-    // version compare only requires the first 3 segments of the version string
-    int code = taosCheckVersion(version, taos_get_server_info(pObj), 3);
+    // version compare only requires the first 1 segments of the version string
+    int code = taosCheckVersion(version, taos_get_server_info(pObj), 1);
     if (code != 0) {
       terrno = code;
       taos_close(pObj);
diff --git a/src/kit/taos-tools b/src/kit/taos-tools
index 8c11dcf6856bca0860e7e9999f57274864218f4f..a6531c1528b5b50fb234e2519106feae91cc8d38 160000
--- a/src/kit/taos-tools
+++ b/src/kit/taos-tools
@@ -1 +1 @@
-Subproject commit 8c11dcf6856bca0860e7e9999f57274864218f4f
+Subproject commit a6531c1528b5b50fb234e2519106feae91cc8d38
diff --git a/src/mnode/src/mnodeShow.c b/src/mnode/src/mnodeShow.c
index 960987e7ad3b570548d9f8eb93a64ed963a5956b..fd0eeea7eea71de982bb4a2e8f73732404e219e9 100644
--- a/src/mnode/src/mnodeShow.c
+++ b/src/mnode/src/mnodeShow.c
@@ -243,7 +243,7 @@ static int32_t mnodeProcessHeartBeatMsg(SMnodeMsg *pMsg) {
   }
 
   SHeartBeatMsg *pHBMsg = pMsg->rpcMsg.pCont;
-  if (taosCheckVersion(pHBMsg->clientVer, version, 3) != TSDB_CODE_SUCCESS) {
+  if (taosCheckVersion(pHBMsg->clientVer, version, 1) != TSDB_CODE_SUCCESS) {
     rpcFreeCont(pRsp);
     return TSDB_CODE_TSC_INVALID_VERSION;  // todo change the error code
   }
@@ -307,7 +307,7 @@ static int32_t mnodeProcessConnectMsg(SMnodeMsg *pMsg) {
     goto connect_over;
   }
 
-  code = taosCheckVersion(pConnectMsg->clientVersion, version, 3);
+  code = taosCheckVersion(pConnectMsg->clientVersion, version, 1);
   if (code != TSDB_CODE_SUCCESS) {
     goto connect_over;
   }
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 80f845b305e73ba7272aca050e38c2502c1afda9..e07306641a2ec482c8dbab1704e57d2b38a26970 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -8471,7 +8471,7 @@ static int32_t deserializeColFilterInfo(SColumnFilterInfo* pColFilters, int16_t
 int32_t convertQueryMsg(SQueryTableMsg *pQueryMsg, SQueryParam* param) {
   int32_t code = TSDB_CODE_SUCCESS;
 
-  if (taosCheckVersion(pQueryMsg->version, version, 3) != 0) {
+  if (taosCheckVersion(pQueryMsg->version, version, 1) != 0) {
     return TSDB_CODE_QRY_INVALID_MSG;
   }
 
diff --git a/tests/develop-test/2-query/constant_compare.py b/tests/develop-test/2-query/constant_compare.py
index a8ca27e63ce0db8e3bd05009e1d9aab4e7995981..21beddc51303a73b0c5eb4cf2f21a5b2e6735c9c 100644
--- a/tests/develop-test/2-query/constant_compare.py
+++ b/tests/develop-test/2-query/constant_compare.py
@@ -1129,6 +1129,56 @@ class TDTestCase:
         tdSql.error('select 1 != 2 and 1 < 2 or \'abc123\' or 2 between \'abc123\' and 5 and false or "abc123" from tb;')
         tdSql.error('select \'1234\' or 1 < 2 or \'aace\' and "cde" between 4 and "def" and "ckas" or 10.1 from tb;')
 
+        #operator: is NULL
+        tdSql.error('select 1 is NULL from tb;')
+        tdSql.error('select 1.0 is NULL from tb;')
+        tdSql.error('select true is NULL from tb;')
+        tdSql.error('select \'a\' is NULL from tb;')
+        tdSql.error('select "abc" is NULL from tb;')
+        tdSql.error('select 1 is NULL and 1.0 is NULL or "abc" is NULL from tb;')
+
+        #operator: is not NULL
+        tdSql.error('select 1 is not NULL from tb;')
+        tdSql.error('select 1.0 is not NULL from tb;')
+        tdSql.error('select true is not NULL from tb;')
+        tdSql.error('select \'a\' is not NULL from tb;')
+        tdSql.error('select "abc" is not NULL from tb;')
+        tdSql.error('select 1 is not NULL and 1.0 is not NULL or "abc" is not NULL from tb;')
+
+        #operator: like
+        tdSql.error('select 1 like 1 from tb;')
+        tdSql.error('select 1.0 like 1.0 from tb;')
+        tdSql.error('select true like true from tb;')
+        tdSql.error('select \'abc\' like \'a_\' from tb;')
+        tdSql.error('select "abc" like "ab__%" from tb;')
+        tdSql.error('select 1 like 1 and 1.0 like 1.0 or "abc" like "a%" from tb;')
+
+        #operator: match
+        tdSql.error('select 1 match 1 from tb;')
+        tdSql.error('select 1.0 match 1.0 from tb;')
+        tdSql.error('select true match true from tb;')
+        tdSql.error('select \'abc\' match \'a_\' from tb;')
+        tdSql.error('select "abc" match "ab__%" from tb;')
+        tdSql.error('select 1 match 1 and 1.0 match 1.0 or "abc" match "a%" from tb;')
+
+        #operator: nmatch
+        tdSql.error('select 1 nmatch 1 from tb;')
+        tdSql.error('select 1.0 nmatch 1.0 from tb;')
+        tdSql.error('select true nmatch true from tb;')
+        tdSql.error('select \'abc\' nmatch \'a_\' from tb;')
+        tdSql.error('select "abc" nmatch "ab__%" from tb;')
+        tdSql.error('select 1 nmatch 1 and 1.0 nmatch 1.0 or "abc" nmatch "a%" from tb;')
+
+        #operator: in
+        tdSql.error('select 1 in 1 from tb;')
+        tdSql.error('select 1 in (1, 2, 3) from tb;')
+        tdSql.error('select 1.0 in 1.0 from tb;')
+        tdSql.error('select 1.0 in (1.0, 2.0, 3.0) from tb;')
+        tdSql.error('select true in (true, false, true) from tb;')
+        tdSql.error('select \'abc\' in (\'acd\', \'bce\') from tb;')
+        tdSql.error('select "abc" in ("acd", "bce") from tb;')
+        tdSql.error('select 1 in (1,2,3) and 1.0 in (1.0,2.0,3.0) or "abc" in ("abc","cde") from tb;')
+
         tdSql.execute('drop database db')
     def stop(self):
         tdSql.close()
diff --git a/tests/develop-test/2-query/func_compare.py b/tests/develop-test/2-query/func_compare.py
index 80894b9e0872a2d08e14e7e04dbafbf0f0f88f1c..6a5b4c7e975e04a982984671b39650a957ef4754 100644
--- a/tests/develop-test/2-query/func_compare.py
+++ b/tests/develop-test/2-query/func_compare.py
@@ -297,6 +297,91 @@ class TDTestCase:
         tdSql.error('select percentile(value, 50) or diff(value) = ceil(value) and apercentile(value, 50) from tb')
         tdSql.error('select floor(3.5) or round(3.5) and ceil(3.5) > true and round(3.5) or 3 from tb')
 
+        #operator: is NULL
+        tdSql.error('select count(*) is NULL from tb;')
+        tdSql.error('select avg(value) is NULL from tb;')
+        tdSql.error('select twa(value) is NULL from tb;')
+        tdSql.error('select sum(value) is NULL from tb;')
+        tdSql.error('select stddev(value) is NULL from tb;')
+        tdSql.error('select min(value) is NULL from tb;')
+        tdSql.error('select max(value) is NULL from tb;')
+        tdSql.error('select first(*) is NULL from tb;')
+        tdSql.error('select last(*) is NULL from tb;')
+        tdSql.error('select top(value, 3) is NULL or bottom(value,3) is NULL from tb;')
+        tdSql.error('select percentile(value, 50) is NULL or apercentile(value, 50) is NULL from tb')
+        tdSql.error('select diff(value) is NULL or ceil(value) is NULL from tb')
+        tdSql.error('select floor(3.5) is NULL or round(3.5) is NULL or ceil(3.5) is NULL from tb')
+
+        #operator: is not NULL
+        tdSql.error('select count(*) is not NULL from tb;')
+        tdSql.error('select avg(value) is not NULL from tb;')
+        tdSql.error('select twa(value) is not NULL from tb;')
+        tdSql.error('select sum(value) is not NULL from tb;')
+        tdSql.error('select stddev(value) is not NULL from tb;')
+        tdSql.error('select min(value) is not NULL from tb;')
+        tdSql.error('select max(value) is not NULL from tb;')
+        tdSql.error('select first(*) is not NULL from tb;')
+        tdSql.error('select last(*) is not NULL from tb;')
+        tdSql.error('select top(value, 3) is not NULL or bottom(value,3) is not NULL from tb;')
+        tdSql.error('select percentile(value, 50) is not NULL or apercentile(value, 50) is not NULL from tb')
+        tdSql.error('select diff(value) is not NULL or ceil(value) is not NULL from tb')
+        tdSql.error('select floor(3.5) is not NULL or round(3.5) is not NULL or ceil(3.5) is not NULL from tb')
+
+        #operator: like
+        tdSql.error('select count(*) like "abc" from tb;')
+        tdSql.error('select avg(value) like "abc" from tb;')
+        tdSql.error('select twa(value) like "abc" from tb;')
+        tdSql.error('select sum(value) like "abc" from tb;')
+        tdSql.error('select stddev(value) like "abc" from tb;')
+        tdSql.error('select min(value) like "abc" from tb;')
+        tdSql.error('select max(value) like "abc" from tb;')
+        tdSql.error('select first(*) like "abc" from tb;')
+        tdSql.error('select last(*) like "abc" from tb;')
+        tdSql.error('select top(value, 3) like "abc" or bottom(value,3) like "abc" from tb;')
+        tdSql.error('select percentile(value, 50) like "abc" or apercentile(value, 50) like "abc" from tb')
+        tdSql.error('select diff(value) like "abc" or ceil(value) like "abc" from tb')
+        tdSql.error('select floor(3.5) like "abc" or round(3.5) like "abc" or ceil(3.5) like "abc" from tb')
+
+        #operator: match
+        tdSql.error('select count(*) match "abc" from tb;')
+        tdSql.error('select avg(value) match "abc" from tb;')
+        tdSql.error('select twa(value) match "abc" from tb;')
+        tdSql.error('select sum(value) match "abc" from tb;')
+        tdSql.error('select stddev(value) match "abc" from tb;')
+        tdSql.error('select min(value) match "abc" from tb;')
+        tdSql.error('select max(value) match "abc" from tb;')
+        tdSql.error('select first(*) match "abc" from tb;')
+        tdSql.error('select last(*) match "abc" from tb;')
+        tdSql.error('select top(value, 3) match "abc" or bottom(value,3) match "abc" from tb;')
+        tdSql.error('select percentile(value, 50) match "abc" or apercentile(value, 50) match "abc" from tb')
+        tdSql.error('select diff(value) match "abc" or ceil(value) match "abc" from tb')
+        tdSql.error('select floor(3.5) match "abc" or round(3.5) match "abc" or ceil(3.5) match "abc" from tb')
+
+        #operator: nmatch
+        tdSql.error('select count(*) nmatch "abc" from tb;')
+        tdSql.error('select avg(value) nmatch "abc" from tb;')
+        tdSql.error('select twa(value) nmatch "abc" from tb;')
+        tdSql.error('select sum(value) nmatch "abc" from tb;')
+        tdSql.error('select stddev(value) nmatch "abc" from tb;')
+        tdSql.error('select min(value) nmatch "abc" from tb;')
+        tdSql.error('select max(value) nmatch "abc" from tb;')
+        tdSql.error('select first(*) nmatch "abc" from tb;')
+        tdSql.error('select last(*) nmatch "abc" from tb;')
+        tdSql.error('select top(value, 3) nmatch "abc" or bottom(value,3) nmatch "abc" from tb;')
+        tdSql.error('select percentile(value, 50) nmatch "abc" or apercentile(value, 50) nmatch "abc" from tb')
+        tdSql.error('select diff(value) nmatch "abc" or ceil(value) nmatch "abc" from tb')
+        tdSql.error('select floor(3.5) nmatch "abc" or round(3.5) nmatch "abc" or ceil(3.5) nmatch "abc" from tb')
+
+        #operator: in
+        tdSql.error('select count(*) in 1 from tb;')
+        tdSql.error('select avg(value) in (1, 2, 3) from tb;')
+        tdSql.error('select twa(value) in 1.0 from tb;')
+        tdSql.error('select sum(value) in (1.0, 2.0, 3.0) from tb;')
+        tdSql.error('select min(value) in (true, false, true) from tb;')
+        tdSql.error('select tbname in (\'acd\', \'bce\') from tb;')
+        tdSql.error('select t in ("acd", "bce") from tb;')
+        tdSql.error('select top(value, 3) in (1,2,3) and ceil(value) in (1.0,2.0,3.0) or last(*) in ("abc","cde") from tb;')
+
         tdSql.execute('drop database db')
 
     def stop(self):
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/auto_create_table_json.py b/tests/develop-test/5-taos-tools/taosbenchmark/auto_create_table_json.py
index 404f922dc7a6fa07acf3fb74c93e66f9d052c6fe..a0567f3510a95708fb7469ec4549b81bda3aade2 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/auto_create_table_json.py
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/auto_create_table_json.py
@@ -37,12 +37,44 @@ class TDTestCase:
         tdSql.checkData(0, 0, 8)
         tdSql.query("select count(*) from db.stb1")
         tdSql.checkData(0, 0, 160)
+        tdSql.query("select distinct(c5) from db.stb1")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c6) from db.stb1")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c7) from db.stb1")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c8) from db.stb1")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c9) from db.stb1")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c10) from db.stb1")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c11) from db.stb1")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c12) from db.stb1")
+        tdSql.checkData(0, 0, None)
 
         tdSql.execute("reset query cache")
         tdSql.query("select count(tbname) from db.`stb1-2`")
         tdSql.checkData(0, 0, 8)
         tdSql.query("select count(*) from db.`stb1-2`")
         tdSql.checkData(0, 0, 160)
+        tdSql.query("select distinct(c5) from db.`stb1-2`")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c6) from db.`stb1-2`")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c7) from db.`stb1-2`")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c8) from db.`stb1-2`")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c9) from db.`stb1-2`")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c10) from db.`stb1-2`")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c11) from db.`stb1-2`")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c12) from db.`stb1-2`")
+        tdSql.checkData(0, 0, None)
 
         cmd = "taosBenchmark -f ./5-taos-tools/taosbenchmark/json/stmt_auto_create_table.json"
         tdLog.info("%s" % cmd)
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/commandline.py b/tests/develop-test/5-taos-tools/taosbenchmark/commandline.py
index 51edecdbbfba7f23c55db9b4afc32bd5720ec36c..b859bef981c5cb454625901eb7427b65b0395d38 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/commandline.py
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/commandline.py
@@ -38,8 +38,6 @@ class TDTestCase:
         tdSql.execute("use newtest")
         tdSql.query("select count(*) from newtest.meters")
         tdSql.checkData(0, 0, 20)
-        tdSql.query("select distinct(c0) from newtest.meters")
-        tdSql.checkRows(7)
         tdSql.query("describe meters")
         tdSql.checkRows(8)
         tdSql.checkData(0, 1, "TIMESTAMP")
@@ -67,8 +65,6 @@ class TDTestCase:
         tdSql.checkData(0, 0, 2)
         tdSql.query("select count(*) from test.meters")
         tdSql.checkData(0, 0, 20)
-        tdSql.query("select distinct(c0) from test.meters")
-        tdSql.checkRows(7)
 
         cmd = "taosBenchmark -n 3 -t 3 -B 2 -i 1 -G -y -T 1 2>&1 | grep sleep | wc -l"
         sleepTimes = subprocess.check_output(cmd, shell=True).decode("utf-8")
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_auto_create_table.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_auto_create_table.json
index e52fadc8576c76e28079eb935f1c95d0302f6b41..8dc121e5a89d6567c5fbe79aab15c717f5cb2881 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_auto_create_table.json
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_auto_create_table.json
@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 20,
+  "thread_pool_size": 10,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 100,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_query.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_query.json
index 9ef1b933d8ea019004bc373529c26f4ba5c58018..12d6c383d3af8b66f4a120b885173aaed67d5d84 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_query.json
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/rest_query.json
@@ -4,7 +4,7 @@
   "confirm_parameter_prompt": "no",
   "databases": "db",
   "query_mode": "rest",
-  "thread_pool_size": 20,
+  "thread_pool_size": 10,
   "response_buffer": 10000,
   "specified_table_query":
   {
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_auto_create_table.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_auto_create_table.json
index 9bb5c4292cf9c1fb6628517dfc044fe2065e2c2e..3cdd2b911eaee7887312b659781d18f68caa1221 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_auto_create_table.json
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_auto_create_table.json
@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 20,
+  "thread_pool_size": 10,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 100,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_insert_alltypes.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_insert_alltypes.json
index 45cf05d3e620f0dfed070d01150ad4961087efaf..7326cbcba2e2eefffe49d34771cb301bcee7a16f 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_insert_alltypes.json
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_insert_alltypes.json
@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 20,
+  "thread_pool_size": 10,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 10,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_json_alltypes.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_json_alltypes.json
new file mode 100644
index 0000000000000000000000000000000000000000..d23d12e800362668c325ff5d252ff4ff9c411656
--- /dev/null
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_json_alltypes.json
@@ -0,0 +1,262 @@
+{
+  "filetype": "insert",
+  "cfgdir": "/etc/taos",
+  "host": "127.0.0.1",
+  "port": 6030,
+  "user": "root",
+  "password": "taosdata",
+  "thread_count": 4,
+  "thread_pool_size": 10,
+  "result_file": "./insert_res.txt",
+  "confirm_parameter_prompt": "no",
+  "prepared_rand": 10,
+  "chinese": "no",
+  "insert_interval": 0,
+  "num_of_records_per_req": 10,
+  "databases": [{
+    "dbinfo": {
+      "name": "db",
+      "drop": "yes",
+      "replica": 1,
+      "days": 10,
+      "cache": 16,
+      "blocks": 8,
+      "precision": "ms",
+      "keep": 36500,
+      "minRows": 100,
+      "maxRows": 4096,
+      "comp":2,
+      "walLevel":1,
+      "cachelast":0,
+      "quorum":1,
+      "fsync":3000,
+      "update": 0
+    },
+    "super_tables": [{
+      "name": "stb1",
+      "child_table_exists":"no",
+      "childtable_count": 8,
+      "childtable_prefix": "stb1_",
+      "escape_character": "no",
+      "auto_create_table": "no",
+      "batch_create_tbl_num": 10,
+      "data_source": "rand",
+      "insert_mode": "sml",
+      "line_protocol": "json",
+      "childtable_limit": 0,
+      "childtable_offset": 0,
+      "insert_rows": 20,
+      "insert_interval": 0,
+      "interlace_rows": 0,
+      "disorder_ratio": 0,
+      "disorder_range": 1000,
+      "timestamp_step": 1,
+      "start_timestamp": "now",
+      "sample_file": "",
+      "use_sample_ts": "no",
+      "tags_file": "",
+      "columns": [{"type": "BOOL"}],
+      "tags": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "BINARY", "len": 19, "count":1}]
+    },{
+      "name": "stb2",
+      "child_table_exists":"no",
+      "childtable_count": 8,
+      "childtable_prefix": "stb2_",
+      "escape_character": "no",
+      "auto_create_table": "no",
+      "batch_create_tbl_num": 10,
+      "data_source": "rand",
+      "insert_mode": "sml",
+      "line_protocol": "json",
+      "childtable_limit": 0,
+      "childtable_offset": 0,
+      "insert_rows": 20,
+      "insert_interval": 0,
+      "interlace_rows": 0,
+      "disorder_ratio": 0,
+      "disorder_range": 1000,
+      "timestamp_step": 1,
+      "start_timestamp": "now",
+      "sample_file": "",
+      "use_sample_ts": "no",
+      "tags_file": "",
+      "columns": [{"type": "TINYINT"}],
+      "tags": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "BINARY", "len": 19, "count":1}]
+    },{
+      "name": "stb3",
+      "child_table_exists":"no",
+      "childtable_count": 8,
+      "childtable_prefix": "stb3_",
+      "escape_character": "no",
+      "auto_create_table": "no",
+      "batch_create_tbl_num": 10,
+      "data_source": "rand",
+      "insert_mode": "sml",
+      "line_protocol": "json",
+      "childtable_limit": 0,
+      "childtable_offset": 0,
+      "insert_rows": 20,
+      "insert_interval": 0,
+      "interlace_rows": 0,
+      "disorder_ratio": 0,
+      "disorder_range": 1000,
+      "timestamp_step": 1,
+      "start_timestamp": "now",
+      "sample_file": "",
+      "use_sample_ts": "no",
+      "tags_file": "",
+      "columns": [{"type": "SMALLINT"}],
+      "tags": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "BINARY", "len": 19, "count":1}]
+    },{
+      "name": "stb4",
+      "child_table_exists":"no",
+      "childtable_count": 8,
+      "childtable_prefix": "stb4_",
+      "escape_character": "no",
+      "auto_create_table": "no",
+      "batch_create_tbl_num": 10,
+      "data_source": "rand",
+      "insert_mode": "sml",
+      "line_protocol": "json",
+      "childtable_limit": 0,
+      "childtable_offset": 0,
+      "insert_rows": 20,
+      "insert_interval": 0,
+      "interlace_rows": 0,
+      "disorder_ratio": 0,
+      "disorder_range": 1000,
+      "timestamp_step": 1,
+      "start_timestamp": "now",
+      "sample_file": "",
+      "use_sample_ts": "no",
+      "tags_file": "",
+      "columns": [{"type": "INT"}],
+      "tags": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "BINARY", "len": 19, "count":1}]
+    },{
+      "name": "stb5",
+      "child_table_exists":"no",
+      "childtable_count": 8,
+      "childtable_prefix": "stb5_",
+      "escape_character": "no",
+      "auto_create_table": "no",
+      "batch_create_tbl_num": 10,
+      "data_source": "rand",
+      "insert_mode": "sml",
+      "line_protocol": "json",
+      "childtable_limit": 0,
+      "childtable_offset": 0,
+      "insert_rows": 20,
+      "insert_interval": 0,
+      "interlace_rows": 0,
+      "disorder_ratio": 0,
+      "disorder_range": 1000,
+      "timestamp_step": 1,
+      "start_timestamp": "now",
+      "sample_file": "",
+      "use_sample_ts": "no",
+      "tags_file": "",
+      "columns": [{"type": "BIGINT"}],
+      "tags": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "BINARY", "len": 19, "count":1}]
+    },{
+      "name": "stb6",
+      "child_table_exists":"no",
+      "childtable_count": 8,
+      "childtable_prefix": "stb6_",
+      "escape_character": "no",
+      "auto_create_table": "no",
+      "batch_create_tbl_num": 10,
+      "data_source": "rand",
+      "insert_mode": "sml",
+      "line_protocol": "json",
+      "childtable_limit": 0,
+      "childtable_offset": 0,
+      "insert_rows": 20,
+      "insert_interval": 0,
+      "interlace_rows": 0,
+      "disorder_ratio": 0,
+      "disorder_range": 1000,
+      "timestamp_step": 1,
+      "start_timestamp": "now",
+      "sample_file": "",
+      "use_sample_ts": "no",
+      "tags_file": "",
+      "columns": [{"type": "FLOAT"}],
+      "tags": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "BINARY", "len": 19, "count":1}]
+    },{
+      "name": "stb7",
+      "child_table_exists":"no",
+      "childtable_count": 8,
+      "childtable_prefix": "stb7_",
+      "escape_character": "no",
+      "auto_create_table": "no",
+      "batch_create_tbl_num": 10,
+      "data_source": "rand",
+      "insert_mode": "sml",
+      "line_protocol": "json",
+      "childtable_limit": 0,
+      "childtable_offset": 0,
+      "insert_rows": 20,
+      "insert_interval": 0,
+      "interlace_rows": 0,
+      "disorder_ratio": 0,
+      "disorder_range": 1000,
+      "timestamp_step": 1,
+      "start_timestamp": "now",
+      "sample_file": "",
+      "use_sample_ts": "no",
+      "tags_file": "",
+      "columns": [{"type": "DOUBLE"}],
+      "tags": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "BINARY", "len": 19, "count":1}]
+    },{
+      "name": "stb8",
+      "child_table_exists":"no",
+      "childtable_count": 8,
+      "childtable_prefix": "stb8_",
+      "escape_character": "no",
+      "auto_create_table": "no",
+      "batch_create_tbl_num": 10,
+      "data_source": "rand",
+      "insert_mode": "sml",
+      "line_protocol": "json",
+      "childtable_limit": 0,
+      "childtable_offset": 0,
+      "insert_rows": 20,
+      "insert_interval": 0,
+      "interlace_rows": 0,
+      "disorder_ratio": 0,
+      "disorder_range": 1000,
+      "timestamp_step": 1,
+      "start_timestamp": "now",
+      "sample_file": "",
+      "use_sample_ts": "no",
+      "tags_file": "",
+      "columns": [{"type": "BINARY", "len": 8}],
+      "tags": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "BINARY", "len": 19, "count":1}]
+    },{
+      "name": "stb9",
+      "child_table_exists":"no",
+      "childtable_count": 8,
+      "childtable_prefix": "stb9_",
+      "escape_character": "no",
+      "auto_create_table": "no",
+      "batch_create_tbl_num": 10,
+      "data_source": "rand",
+      "insert_mode": "sml",
+      "line_protocol": "json",
+      "childtable_limit": 0,
+      "childtable_offset": 0,
+      "insert_rows": 20,
+      "insert_interval": 0,
+      "interlace_rows": 0,
+      "disorder_ratio": 0,
+      "disorder_range": 1000,
+      "timestamp_step": 1,
+      "start_timestamp": "now",
+      "sample_file": "",
+      "use_sample_ts": "no",
+      "tags_file": "",
+      "columns": [{"type": "NCHAR", "len": 8}],
+      "tags": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "BINARY", "len": 19, "count":1}]
+    }]
+  }]
+}
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_json.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_json.json
new file mode 100644
index 0000000000000000000000000000000000000000..e037fff0aaa23fbb91cdc66e663aa1fe79d03864
--- /dev/null
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_json.json
@@ -0,0 +1,107 @@
+{
+  "filetype": "insert",
+  "cfgdir": "/etc/taos",
+  "host": "127.0.0.1",
+  "port": 6030,
+  "user": "root",
+  "password": "taosdata",
+  "thread_count": 4,
+  "thread_pool_size": 20,
+  "result_file": "./insert_res.txt",
+  "confirm_parameter_prompt": "no",
+  "prepared_rand": 10,
+  "chinese": "no",
+  "insert_interval": 0,
+  "num_of_records_per_req": 10,
+  "databases": [
+    {
+      "dbinfo": {
+        "name": "db3",
+        "drop": "yes",
+        "replica": 1,
+        "days": 10,
+        "cache": 16,
+        "blocks": 8,
+        "precision": "ms",
+        "keep": 36500,
+        "minRows": 100,
+        "maxRows": 4096,
+        "comp": 2,
+        "walLevel": 1,
+        "cachelast": 0,
+        "quorum": 1,
+        "fsync": 3000,
+        "update": 0
+      },
+      "super_tables": [
+        {
+          "name": "stb1",
+          "child_table_exists": "no",
+          "childtable_count": 8,
+          "childtable_prefix": "stb1_",
+          "escape_character": "no",
+          "auto_create_table": "no",
+          "batch_create_tbl_num": 10,
+          "data_source": "rand",
+          "insert_mode": "sml-rest",
+          "line_protocol": "json",
+          "childtable_limit": 0,
+          "childtable_offset": 0,
+          "insert_rows": 20,
+          "insert_interval": 0,
+          "interlace_rows": 0,
+          "disorder_ratio": 0,
+          "disorder_range": 1000,
+          "timestamp_step": 1,
+          "start_timestamp": "now",
+          "sample_file": "",
+          "use_sample_ts": "no",
+          "tags_file": "",
+          "columns": [
+            {
+              "type": "INT"
+            }
+          ],
+          "tags": [
+            {
+              "type": "INT"
+            }
+          ]
+        },{
+          "name": "stb2",
+          "child_table_exists": "no",
+          "childtable_count": 8,
+          "childtable_prefix": "stb2_",
+          "escape_character": "no",
+          "auto_create_table": "no",
+          "batch_create_tbl_num": 10,
+          "data_source": "rand",
+          "insert_mode": "sml-rest",
+          "line_protocol": "json",
+          "childtable_limit": 0,
+          "childtable_offset": 0,
+          "insert_rows": 20,
+          "insert_interval": 0,
+          "interlace_rows": 3,
+          "disorder_ratio": 0,
+          "disorder_range": 1000,
+          "timestamp_step": 1,
+          "start_timestamp": "now",
+          "sample_file": "",
+          "use_sample_ts": "no",
+          "tags_file": "",
+          "columns": [
+            {
+              "type": "INT"
+            }
+          ],
+          "tags": [
+            {
+              "type": "INT"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_line.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_line.json
new file mode 100644
index 0000000000000000000000000000000000000000..5000da489fc4c97f1ee3515c095655d6b183bfff
--- /dev/null
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_line.json
@@ -0,0 +1,267 @@
+{
+  "filetype": "insert",
+  "cfgdir": "/etc/taos",
+  "host": "127.0.0.1",
+  "port": 6030,
+  "user": "root",
+  "password": "taosdata",
+  "thread_count": 4,
+  "thread_pool_size": 20,
+  "result_file": "./insert_res.txt",
+  "confirm_parameter_prompt": "no",
+  "prepared_rand": 10,
+  "chinese": "no",
+  "insert_interval": 0,
+  "num_of_records_per_req": 10,
+  "databases": [
+    {
+      "dbinfo": {
+        "name": "db2",
+        "drop": "yes",
+        "replica": 1,
+        "days": 10,
+        "cache": 16,
+        "blocks": 8,
+        "precision": "ms",
+        "keep": 36500,
+        "minRows": 100,
+        "maxRows": 4096,
+        "comp": 2,
+        "walLevel": 1,
+        "cachelast": 0,
+        "quorum": 1,
+        "fsync": 3000,
+        "update": 0
+      },
+      "super_tables": [
+        {
+          "name": "stb1",
+          "child_table_exists": "no",
+          "childtable_count": 8,
+          "childtable_prefix": "stb1_",
+          "escape_character": "no",
+          "auto_create_table": "no",
+          "batch_create_tbl_num": 10,
+          "data_source": "rand",
+          "insert_mode": "sml-rest",
+          "line_protocol": "line",
+          "childtable_limit": 0,
+          "childtable_offset": 0,
+          "insert_rows": 20,
+          "insert_interval": 0,
+          "interlace_rows": 0,
+          "disorder_ratio": 0,
+          "disorder_range": 1000,
+          "timestamp_step": 1,
+          "start_timestamp": "now",
+          "sample_file": "",
+          "use_sample_ts": "no",
+          "tags_file": "",
+          "columns": [
+            {
+              "type": "INT"
+            },
+            {
+              "type": "BIGINT"
+            },
+            {
+              "type": "FLOAT"
+            },
+            {
+              "type": "DOUBLE"
+            },
+            {
+              "type": "SMALLINT"
+            },
+            {
+              "type": "TINYINT"
+            },
+            {
+              "type": "BOOL"
+            },
+            {
+              "type": "NCHAR",
+              "len": 17,
+              "count": 1
+            },
+            {
+              "type": "UINT"
+            },
+            {
+              "type": "UBIGINT"
+            },
+            {
+              "type": "UTINYINT"
+            },
+            {
+              "type": "USMALLINT"
+            },
+            {
+              "type": "BINARY",
+              "len": 19,
+              "count": 1
+            }
+          ],
+          "tags": [
+            {
+              "type": "INT"
+            },
+            {
+              "type": "BIGINT"
+            },
+            {
+              "type": "FLOAT"
+            },
+            {
+              "type": "DOUBLE"
+            },
+            {
+              "type": "SMALLINT"
+            },
+            {
+              "type": "TINYINT"
+            },
+            {
+              "type": "BOOL"
+            },
+            {
+              "type": "NCHAR",
+              "len": 17,
+              "count": 1
+            },
+            {
+              "type": "UINT"
+            },
+            {
+              "type": "UBIGINT"
+            },
+            {
+              "type": "UTINYINT"
+            },
+            {
+              "type": "USMALLINT"
+            },
+            {
+              "type": "BINARY",
+              "len": 19,
+              "count": 1
+            }
+          ]
+        },{
+          "name": "stb2",
+          "child_table_exists": "no",
+          "childtable_count": 8,
+          "childtable_prefix": "stb2_",
+          "escape_character": "no",
+          "auto_create_table": "no",
+          "batch_create_tbl_num": 10,
+          "data_source": "rand",
+          "insert_mode": "sml-rest",
+          "line_protocol": "line",
+          "childtable_limit": 0,
+          "childtable_offset": 0,
+          "insert_rows": 20,
+          "insert_interval": 0,
+          "interlace_rows": 6,
+          "disorder_ratio": 0,
+          "disorder_range": 1000,
+          "timestamp_step": 1,
+          "start_timestamp": "now",
+          "sample_file": "",
+          "use_sample_ts": "no",
+          "tags_file": "",
+          "columns": [
+            {
+              "type": "INT"
+            },
+            {
+              "type": "BIGINT"
+            },
+            {
+              "type": "FLOAT"
+            },
+            {
+              "type": "DOUBLE"
+            },
+            {
+              "type": "SMALLINT"
+            },
+            {
+              "type": "TINYINT"
+            },
+            {
+              "type": "BOOL"
+            },
+            {
+              "type": "NCHAR",
+              "len": 17,
+              "count": 1
+            },
+            {
+              "type": "UINT"
+            },
+            {
+              "type": "UBIGINT"
+            },
+            {
+              "type": "UTINYINT"
+            },
+            {
+              "type": "USMALLINT"
+            },
+            {
+              "type": "BINARY",
+              "len": 19,
+              "count": 1
+            }
+          ],
+          "tags": [
+            {
+              "type": "INT"
+            },
+            {
+              "type": "BIGINT"
+            },
+            {
+              "type": "FLOAT"
+            },
+            {
+              "type": "DOUBLE"
+            },
+            {
+              "type": "SMALLINT"
+            },
+            {
+              "type": "TINYINT"
+            },
+            {
+              "type": "BOOL"
+            },
+            {
+              "type": "NCHAR",
+              "len": 17,
+              "count": 1
+            },
+            {
+              "type": "UINT"
+            },
+            {
+              "type": "UBIGINT"
+            },
+            {
+              "type": "UTINYINT"
+            },
+            {
+              "type": "USMALLINT"
+            },
+            {
+              "type": "BINARY",
+              "len": 19,
+              "count": 1
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_telnet.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_telnet.json
new file mode 100644
index 0000000000000000000000000000000000000000..c9c4554e015a3927fe0b7fa97e7b7dc8826a95d1
--- /dev/null
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_rest_telnet.json
@@ -0,0 +1,187 @@
+{
+  "filetype": "insert",
+  "cfgdir": "/etc/taos",
+  "host": "127.0.0.1",
+  "port": 6030,
+  "user": "root",
+  "password": "taosdata",
+  "thread_count": 4,
+  "thread_pool_size": 20,
+  "result_file": "./insert_res.txt",
+  "confirm_parameter_prompt": "no",
+  "prepared_rand": 10,
+  "chinese": "no",
+  "insert_interval": 0,
+  "num_of_records_per_req": 10,
+  "databases": [
+    {
+      "dbinfo": {
+        "name": "db",
+        "drop": "yes",
+        "replica": 1,
+        "days": 10,
+        "cache": 16,
+        "blocks": 8,
+        "precision": "ms",
+        "keep": 36500,
+        "minRows": 100,
+        "maxRows": 4096,
+        "comp": 2,
+        "walLevel": 1,
+        "cachelast": 0,
+        "quorum": 1,
+        "fsync": 3000,
+        "update": 0
+      },
+      "super_tables": [
+        {
+          "name": "stb1",
+          "child_table_exists": "no",
+          "childtable_count": 8,
+          "childtable_prefix": "stb1_",
+          "escape_character": "no",
+          "auto_create_table": "no",
+          "batch_create_tbl_num": 10,
+          "data_source": "rand",
+          "insert_mode": "sml-rest",
+          "line_protocol": "telnet",
+          "childtable_limit": 0,
+          "childtable_offset": 0,
+          "insert_rows": 20,
+          "insert_interval": 0,
+          "interlace_rows": 0,
+          "disorder_ratio": 0,
+          "disorder_range": 1000,
+          "timestamp_step": 1,
+          "start_timestamp": "now",
+          "sample_file": "",
+          "use_sample_ts": "no",
+          "tags_file": "",
+          "columns": [
+            {
+              "type": "INT"
+            }
+          ],
+          "tags": [
+            {
+              "type": "INT"
+            },
+            {
+              "type": "BIGINT"
+            },
+            {
+              "type": "FLOAT"
+            },
+            {
+              "type": "DOUBLE"
+            },
+            {
+              "type": "SMALLINT"
+            },
+            {
+              "type": "TINYINT"
+            },
+            {
+              "type": "BOOL"
+            },
+            {
+              "type": "NCHAR",
+              "len": 17,
+              "count": 1
+            },
+            {
+              "type": "UINT"
+            },
+            {
+              "type": "UBIGINT"
+            },
+            {
+              "type": "UTINYINT"
+            },
+            {
+              "type": "USMALLINT"
+            },
+            {
+              "type": "BINARY",
+              "len": 19,
+              "count": 1
+            }
+          ]
+        },{
+          "name": "stb2",
+          "child_table_exists": "no",
+          "childtable_count": 8,
+          "childtable_prefix": "stb2_",
+          "escape_character": "no",
+          "auto_create_table": "no",
+          "batch_create_tbl_num": 10,
+          "data_source": "rand",
+          "insert_mode": "sml-rest",
+          "line_protocol": "telnet",
+          "childtable_limit": 0,
+          "childtable_offset": 0,
+          "insert_rows": 20,
+          "insert_interval": 0,
+          "interlace_rows": 5,
+          "disorder_ratio": 0,
+          "disorder_range": 1000,
+          "timestamp_step": 1,
+          "start_timestamp": "now",
+          "sample_file": "",
+          "use_sample_ts": "no",
+          "tags_file": "",
+          "columns": [
+            {
+              "type": "INT"
+            }
+          ],
+          "tags": [
+            {
+              "type": "INT"
+            },
+            {
+              "type": "BIGINT"
+            },
+            {
+              "type": "FLOAT"
+            },
+            {
+              "type": "DOUBLE"
+            },
+            {
+              "type": "SMALLINT"
+            },
+            {
+              "type": "TINYINT"
+            },
+            {
+              "type": "BOOL"
+            },
+            {
+              "type": "NCHAR",
+              "len": 17,
+              "count": 1
+            },
+            {
+              "type": "UINT"
+            },
+            {
+              "type": "UBIGINT"
+            },
+            {
+              "type": "UTINYINT"
+            },
+            {
+              "type": "USMALLINT"
+            },
+            {
+              "type": "BINARY",
+              "len": 19,
+              "count": 1
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_telnet_alltypes.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_telnet_alltypes.json
new file mode 100644
index 0000000000000000000000000000000000000000..739e0eaca4fed0985aa9ae06fea91e4a5f337373
--- /dev/null
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/sml_telnet_alltypes.json
@@ -0,0 +1,362 @@
+{
+  "filetype": "insert",
+  "cfgdir": "/etc/taos",
+  "host": "127.0.0.1",
+  "port": 6030,
+  "user": "root",
+  "password": "taosdata",
+  "thread_count": 4,
+  "thread_pool_size": 10,
+  "result_file": "./insert_res.txt",
+  "confirm_parameter_prompt": "no",
+  "prepared_rand": 10,
+  "chinese": "no",
+  "insert_interval": 0,
+  "num_of_records_per_req": 10,
+  "databases": [{
+    "dbinfo": {
+      "name": "db",
+      "drop": "yes",
+      "replica": 1,
+      "days": 10,
+      "cache": 16,
+      "blocks": 8,
+      "precision": "ms",
+      "keep": 36500,
+      "minRows": 100,
+      "maxRows": 4096,
+      "comp":2,
+      "walLevel":1,
+      "cachelast":0,
+      "quorum":1,
+      "fsync":3000,
+      "update": 0
+    },
+    "super_tables": [{
+      "name": "stb1",
+      "child_table_exists":"no",
+      "childtable_count": 8,
+      "childtable_prefix": "stb1_",
+      "escape_character": "no",
+      "auto_create_table": "no",
+      "batch_create_tbl_num": 10,
+      "data_source": "rand",
+      "insert_mode": "sml",
+      "line_protocol": "telnet",
+      "childtable_limit": 0,
+      "childtable_offset": 0,
+      "insert_rows": 20,
+      "insert_interval": 0,
+      "interlace_rows": 0,
+      "disorder_ratio": 0,
+      "disorder_range": 1000,
+      "timestamp_step": 1,
+      "start_timestamp": "now",
+      "sample_file": "",
+      "use_sample_ts": "no",
+      "tags_file": "",
+      "columns": [{"type": "BOOL"}],
+      "tags": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 19, "count":1}]
+    },{
+      "name": "stb2",
+      "child_table_exists":"no",
+      "childtable_count": 8,
+      "childtable_prefix": "stb2_",
+      "escape_character": "no",
+      "auto_create_table": "no",
+      "batch_create_tbl_num": 10,
+      "data_source": "rand",
+      "insert_mode": "sml",
+      "line_protocol": "telnet",
+      "childtable_limit": 0,
+      "childtable_offset": 0,
+      "insert_rows": 20,
+      "insert_interval": 0,
+      "interlace_rows": 0,
+      "disorder_ratio": 0,
+      "disorder_range": 1000,
+      "timestamp_step": 1,
+      "start_timestamp": "now",
+      "sample_file": "",
+      "use_sample_ts": "no",
+      "tags_file": "",
+      "columns": [{"type": "TINYINT"}],
+      "tags": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 19, "count":1}]
+    },{
+      "name": "stb3",
+      "child_table_exists":"no",
+      "childtable_count": 8,
+      "childtable_prefix": "stb3_",
+      "escape_character": "no",
+      "auto_create_table": "no",
+      "batch_create_tbl_num": 10,
+      "data_source": "rand",
+      "insert_mode": "sml",
+      "line_protocol": "telnet",
+      "childtable_limit": 0,
+      "childtable_offset": 0,
+      "insert_rows": 20,
+      "insert_interval": 0,
+      "interlace_rows": 0,
+      "disorder_ratio": 0,
+      "disorder_range": 1000,
+      "timestamp_step": 1,
+      "start_timestamp": "now",
+      "sample_file": "",
+      "use_sample_ts": "no",
+      "tags_file": "",
+      "columns": [{"type": "UTINYINT"}],
+      "tags": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 19, "count":1}]
+    },{
+      "name": "stb4",
+      "child_table_exists":"no",
+      "childtable_count": 8,
+      "childtable_prefix": "stb4_",
+      "escape_character": "no",
+      "auto_create_table": "no",
+      "batch_create_tbl_num": 10,
+      "data_source": "rand",
+      "insert_mode": "sml",
+      "line_protocol": "telnet",
+      "childtable_limit": 0,
+      "childtable_offset": 0,
+      "insert_rows": 20,
+      "insert_interval": 0,
+      "interlace_rows": 0,
+      "disorder_ratio": 0,
+      "disorder_range": 1000,
+      "timestamp_step": 1,
+      "start_timestamp": "now",
+      "sample_file": "",
+      "use_sample_ts": "no",
+      "tags_file": "",
+      "columns": [{"type": "SMALLINT"}],
+      "tags": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 19, "count":1}]
+    },{
+      "name": "stb5",
+      "child_table_exists":"no",
+      "childtable_count": 8,
+      "childtable_prefix": "stb5_",
+      "escape_character": "no",
+      "auto_create_table": "no",
+      "batch_create_tbl_num": 10,
+      "data_source": "rand",
+      "insert_mode": "sml",
+      "line_protocol": "telnet",
+      "childtable_limit": 0,
+      "childtable_offset": 0,
+      "insert_rows": 20,
+      "insert_interval": 0,
+      "interlace_rows": 0,
+      "disorder_ratio": 0,
+      "disorder_range": 1000,
+      "timestamp_step": 1,
+      "start_timestamp": "now",
+      "sample_file": "",
+      "use_sample_ts": "no",
+      "tags_file": "",
+      "columns": [{"type": "USMALLINT"}],
+      "tags": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 19, "count":1}]
+    },{
+      "name": "stb6",
+      "child_table_exists":"no",
+      "childtable_count": 8,
+      "childtable_prefix": "stb6_",
+      "escape_character": "no",
+      "auto_create_table": "no",
+      "batch_create_tbl_num": 10,
+      "data_source": "rand",
+      "insert_mode": "sml",
+      "line_protocol": "telnet",
+      "childtable_limit": 0,
+      "childtable_offset": 0,
+      "insert_rows": 20,
+      "insert_interval": 0,
+      "interlace_rows": 0,
+      "disorder_ratio": 0,
+      "disorder_range": 1000,
+      "timestamp_step": 1,
+      "start_timestamp": "now",
+      "sample_file": "",
+      "use_sample_ts": "no",
+      "tags_file": "",
+      "columns": [{"type": "INT"}],
+      "tags": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 19, "count":1}]
+    },{
+      "name": "stb7",
+      "child_table_exists":"no",
+      "childtable_count": 8,
+      "childtable_prefix": "stb7_",
+      "escape_character": "no",
+      "auto_create_table": "no",
+      "batch_create_tbl_num": 10,
+      "data_source": "rand",
+      "insert_mode": "sml",
+      "line_protocol": "telnet",
+      "childtable_limit": 0,
+      "childtable_offset": 0,
+      "insert_rows": 20,
+      "insert_interval": 0,
+      "interlace_rows": 0,
+      "disorder_ratio": 0,
+      "disorder_range": 1000,
+      "timestamp_step": 1,
+      "start_timestamp": "now",
+      "sample_file": "",
+      "use_sample_ts": "no",
+      "tags_file": "",
+      "columns": [{"type": "UINT"}],
+      "tags": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 19, "count":1}]
+    },{
+      "name": "stb8",
+      "child_table_exists":"no",
+      "childtable_count": 8,
+      "childtable_prefix": "stb8_",
+      "escape_character": "no",
+      "auto_create_table": "no",
+      "batch_create_tbl_num": 10,
+      "data_source": "rand",
+      "insert_mode": "sml",
+      "line_protocol": "telnet",
+      "childtable_limit": 0,
+      "childtable_offset": 0,
+      "insert_rows": 20,
+      "insert_interval": 0,
+      "interlace_rows": 0,
+      "disorder_ratio": 0,
+      "disorder_range": 1000,
+      "timestamp_step": 1,
+      "start_timestamp": "now",
+      "sample_file": "",
+      "use_sample_ts": "no",
+      "tags_file": "",
+      "columns": [{"type": "BIGINT"}],
+      "tags": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 19, "count":1}]
+    },{
+      "name": "stb9",
+      "child_table_exists":"no",
+      "childtable_count": 8,
+      "childtable_prefix": "stb9_",
+      "escape_character": "no",
+      "auto_create_table": "no",
+      "batch_create_tbl_num": 10,
+      "data_source": "rand",
+      "insert_mode": "sml",
+      "line_protocol": "telnet",
+      "childtable_limit": 0,
+      "childtable_offset": 0,
+      "insert_rows": 20,
+      "insert_interval": 0,
+      "interlace_rows": 0,
+      "disorder_ratio": 0,
+      "disorder_range": 1000,
+      "timestamp_step": 1,
+      "start_timestamp": "now",
+      "sample_file": "",
+      "use_sample_ts": "no",
+      "tags_file": "",
+      "columns": [{"type": "UBIGINT"}],
+      "tags": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 19, "count":1}]
+    },{
+      "name": "stb10",
+      "child_table_exists":"no",
+      "childtable_count": 8,
+      "childtable_prefix": "stb10_",
+      "escape_character": "no",
+      "auto_create_table": "no",
+      "batch_create_tbl_num": 10,
+      "data_source": "rand",
+      "insert_mode": "sml",
+      "line_protocol": "telnet",
+      "childtable_limit": 0,
+      "childtable_offset": 0,
+      "insert_rows": 20,
+      "insert_interval": 0,
+      "interlace_rows": 0,
+      "disorder_ratio": 0,
+      "disorder_range": 1000,
+      "timestamp_step": 1,
+      "start_timestamp": "now",
+      "sample_file": "",
+      "use_sample_ts": "no",
+      "tags_file": "",
+      "columns": [{"type": "FLOAT"}],
+      "tags": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 19, "count":1}]
+    },{
+      "name": "stb11",
+      "child_table_exists":"no",
+      "childtable_count": 8,
+      "childtable_prefix": "stb11_",
+      "escape_character": "no",
+      "auto_create_table": "no",
+      "batch_create_tbl_num": 10,
+      "data_source": "rand",
+      "insert_mode": "sml",
+      "line_protocol": "telnet",
+      "childtable_limit": 0,
+      "childtable_offset": 0,
+      "insert_rows": 20,
+      "insert_interval": 0,
+      "interlace_rows": 0,
+      "disorder_ratio": 0,
+      "disorder_range": 1000,
+      "timestamp_step": 1,
+      "start_timestamp": "now",
+      "sample_file": "",
+      "use_sample_ts": "no",
+      "tags_file": "",
+      "columns": [{"type": "DOUBLE"}],
+      "tags": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 19, "count":1}]
+    },{
+      "name": "stb12",
+      "child_table_exists":"no",
+      "childtable_count": 8,
+      "childtable_prefix": "stb12_",
+      "escape_character": "no",
+      "auto_create_table": "no",
+      "batch_create_tbl_num": 10,
+      "data_source": "rand",
+      "insert_mode": "sml",
+      "line_protocol": "telnet",
+      "childtable_limit": 0,
+      "childtable_offset": 0,
+      "insert_rows": 20,
+      "insert_interval": 0,
+      "interlace_rows": 0,
+      "disorder_ratio": 0,
+      "disorder_range": 1000,
+      "timestamp_step": 1,
+      "start_timestamp": "now",
+      "sample_file": "",
+      "use_sample_ts": "no",
+      "tags_file": "",
+      "columns": [{"type": "BINARY", "len": 8}],
+      "tags": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 19, "count":1}]
+    },{
+      "name": "stb13",
+      "child_table_exists":"no",
+      "childtable_count": 8,
+      "childtable_prefix": "stb13_",
+      "escape_character": "no",
+      "auto_create_table": "no",
+      "batch_create_tbl_num": 10,
+      "data_source": "rand",
+      "insert_mode": "sml",
+      "line_protocol": "telnet",
+      "childtable_limit": 0,
+      "childtable_offset": 0,
+      "insert_rows": 20,
+      "insert_interval": 0,
+      "interlace_rows": 0,
+      "disorder_ratio": 0,
+      "disorder_range": 1000,
+      "timestamp_step": 1,
+      "start_timestamp": "now",
+      "sample_file": "",
+      "use_sample_ts": "no",
+      "tags_file": "",
+      "columns": [{"type": "NCHAR", "len": 8}],
+      "tags": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 19, "count":1}]
+    }]
+  }]
+}
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/stmt_auto_create_table.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/stmt_auto_create_table.json
index ebe5e3f043eac127acd4069a3088e5b49a782824..d917bec0c94fec4ee66e2cfe33e7e91aac9e8a3e 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/stmt_auto_create_table.json
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/stmt_auto_create_table.json
@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 20,
+  "thread_pool_size": 10,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 100,
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/super_subscribe.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/super_subscribe.json
new file mode 100644
index 0000000000000000000000000000000000000000..6284caf8b26b85bc379df16a7f3914fa9a8a9297
--- /dev/null
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/super_subscribe.json
@@ -0,0 +1,24 @@
+{
+  "filetype": "subscribe",
+  "cfgdir": "/etc/taos",
+  "host": "127.0.0.1",
+  "port": 6030,
+  "user": "root",
+  "password": "taosdata",
+  "databases": "db",
+  "confirm_parameter_prompt": "no",
+  "super_table_query": {
+    "stblname": "stb",
+    "threads": 1,
+    "mode": "sync",
+    "interval": 1000,
+    "restart": "yes",
+    "keepProgress": "yes",
+    "endAfterConsume": 1,
+    "sqls": [
+      {
+        "sql": "select * from xxxx;"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_auto_create_table.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_auto_create_table.json
index fea72a34fb74c52f06e7549008333d33ce537d08..0895f1b45cad6b6978e7820db0bf8936f772ffcc 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_auto_create_table.json
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_auto_create_table.json
@@ -6,7 +6,7 @@
   "user": "root",
   "password": "taosdata",
   "thread_count": 4,
-  "thread_pool_size": 20,
+  "thread_pool_size": 10,
   "result_file": "./insert_res.txt",
   "confirm_parameter_prompt": "no",
   "prepared_rand": 100,
@@ -55,6 +55,7 @@
       "sample_file": "./sample.csv",
       "use_sample_ts": "no",
       "tags_file": "",
+      "partial_col_num": 5,
       "columns": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 29, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 23, "count":1}],
       "tags": [{"type": "TIMESTAMP"},{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 19, "count":1}]
     },{
@@ -80,6 +81,7 @@
       "sample_file": "./sample.csv",
       "use_sample_ts": "no",
       "tags_file": "",
+      "partial_col_num": 5,
       "columns": [{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 29, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 23, "count":1}],
       "tags": [{"type": "TIMESTAMP"},{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 19, "count":1}]
     }]
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_insert_alltypes.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_insert_alltypes.json
index 698fb599f595fbbc4a1fd130696e41059362ca50..6816ef5c3dd7dd9c59835a72bd10637814b4537d 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_insert_alltypes.json
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_insert_alltypes.json
@@ -55,6 +55,7 @@
       "sample_file": "./sample.csv",
       "use_sample_ts": "no",
       "tags_file": "",
+      "partial_col_num": 999,
       "columns": [{"type": "TIMESTAMP"},{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 29, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 23, "count":1}],
       "tags": [{"type": "TIMESTAMP"},{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 19, "count":1}]
     }]
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_limit_offset.json b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_limit_offset.json
index c78317aade33cd3fea4a400511dee5b1431bc473..346e3cd8680cf3836523daf693f46bb2a0e1cffd 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_limit_offset.json
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/json/taosc_limit_offset.json
@@ -55,7 +55,8 @@
       "sample_file": "./sample.csv",
       "use_sample_ts": "no",
       "tags_file": "",
-      "columns": [{"type": "TIMESTAMP"},{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 29, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 23, "count":1}],
+      "partial_col_num": 3,
+      "columns": [{"type": "TIMESTAMP"},{"type": "INT", "len": 0}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 29, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 23, "count":1}],
       "tags": [{"type": "TIMESTAMP"},{"type": "INT"}, {"type": "BIGINT"}, {"type": "FLOAT"}, {"type": "DOUBLE"}, {"type": "SMALLINT"}, {"type": "TINYINT"}, {"type": "BOOL"}, {"type": "NCHAR","len": 17, "count":1}, {"type": "UINT"}, {"type": "UBIGINT"}, {"type": "UTINYINT"}, {"type": "USMALLINT"}, {"type": "BINARY", "len": 19, "count":1}]
     }]
   }]
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/limit_offset_json.py b/tests/develop-test/5-taos-tools/taosbenchmark/limit_offset_json.py
index 20e64fa7458fecb87771bd98eec59a886e3663b3..803e57ecc873b89fdc941ee87f27ce38dde18a1a 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/limit_offset_json.py
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/limit_offset_json.py
@@ -56,6 +56,30 @@ class TDTestCase:
         tdSql.checkData(0, 0, 8)
         tdSql.query("select count(*) from db.stb")
         tdSql.checkData(0, 0, 40)
+        tdSql.query("select distinct(c1) from db.stb")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c3) from db.stb")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c4) from db.stb")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c5) from db.stb")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c6) from db.stb")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c7) from db.stb")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c8) from db.stb")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c9) from db.stb")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c10) from db.stb")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c11) from db.stb")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c12) from db.stb")
+        tdSql.checkData(0, 0, None)
+        tdSql.query("select distinct(c13) from db.stb")
+        tdSql.checkData(0, 0, None)
 
     def stop(self):
         tdSql.close()
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/sml_interlace.py b/tests/develop-test/5-taos-tools/taosbenchmark/sml_interlace.py
index f704d684fbb7a3d1f9778bccfac0a95ddbc34e4b..30ee6e87bdaaa26fad7550b0075939f8ee2f5cb9 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/sml_interlace.py
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/sml_interlace.py
@@ -38,9 +38,11 @@ class TDTestCase:
         tdSql.query("select count(tbname) from db.stb2")
         tdSql.checkData(0, 0, 8)
         tdSql.query("select count(*) from db.stb1")
-        tdSql.checkData(0, 0, 160)
+        result = tdSql.getData(0, 0)
+        assert result <= 160, "result is %s > expect: 160" % result
         tdSql.query("select count(*) from db.stb2")
-        tdSql.checkData(0, 0, 160)
+        result = tdSql.getData(0, 0)
+        assert result <= 160, "result is %s > expect: 160" % result
 
     def stop(self):
         tdSql.close()
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/sml_json_alltypes.py b/tests/develop-test/5-taos-tools/taosbenchmark/sml_json_alltypes.py
index dc18bda7ecbfbc2207d5919bc663d1bd82c7ae3e..6816be6156e39faacbda4c470d99dc347875494e 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/sml_json_alltypes.py
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/sml_json_alltypes.py
@@ -29,7 +29,7 @@ class TDTestCase:
         tdSql.init(conn.cursor(), logSql)
 
     def run(self):
-        cmd = "taosBenchmark -f ./5-taos-tools/taosbenchmark/json/json_alltypes.json"
+        cmd = "taosBenchmark -f ./5-taos-tools/taosbenchmark/json/sml_json_alltypes.json"
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("reset query cache")
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/sml_telnet_alltypes.py b/tests/develop-test/5-taos-tools/taosbenchmark/sml_telnet_alltypes.py
index 9285de99848acdd1674f6242d0865189d2e17920..0b96fd37389d61bf370ec54d85a160ad940970ae 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/sml_telnet_alltypes.py
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/sml_telnet_alltypes.py
@@ -29,7 +29,7 @@ class TDTestCase:
         tdSql.init(conn.cursor(), logSql)
 
     def run(self):
-        cmd = "taosBenchmark -f ./5-taos-tools/taosbenchmark/json/telnet_alltypes.json"
+        cmd = "taosBenchmark -f ./5-taos-tools/taosbenchmark/json/sml_telnet_alltypes.json"
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
         tdSql.execute("reset query cache")
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/subscripe_json.py b/tests/develop-test/5-taos-tools/taosbenchmark/subscripe_json.py
index 726b4188e0824530cb78330f07a822e93e8ecc51..13ff130a742c94f4a2ba176fcaff796fe0f9f605 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/subscripe_json.py
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/subscripe_json.py
@@ -38,8 +38,12 @@ class TDTestCase:
         tdSql.execute("insert into stb_2 using stb tags (2) values (now, 2)")
         cmd = "taosBenchmark -f ./5-taos-tools/taosbenchmark/json/specified_subscribe.json -g"
         tdLog.info("%s" % cmd)
-        os.system("%s" % cmd)
-        tdSql.execute("reset query cache")
+        assert os.system("%s" % cmd) == 0
+
+        cmd = "taosBenchmark -f ./5-taos-tools/taosbenchmark/json/super_subscribe.json -g"
+        tdLog.info("%s" % cmd)
+        assert os.system("%s" % cmd) == 0
+
 
     def stop(self):
         tdSql.close()
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/taosadapter_json.py b/tests/develop-test/5-taos-tools/taosbenchmark/taosadapter_json.py
new file mode 100644
index 0000000000000000000000000000000000000000..4f60979e2a31148d6a193819bebfd531421b7b5f
--- /dev/null
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/taosadapter_json.py
@@ -0,0 +1,77 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+import os
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def caseDescription(self):
+        '''
+        [TD-11510] taosBenchmark test cases
+        '''
+        return
+
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        cmd = "taosBenchmark -f ./5-taos-tools/taosbenchmark/json/sml_rest_telnet.json"
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.execute("reset query cache")
+        tdSql.query("select count(tbname) from db.stb1")
+        tdSql.checkData(0, 0, 8)
+        tdSql.query("select count(*) from db.stb1")
+        tdSql.checkData(0, 0, 160)
+        tdSql.query("select count(tbname) from db.stb2")
+        tdSql.checkData(0, 0, 8)
+        tdSql.query("select count(*) from db.stb2")
+        tdSql.checkData(0, 0, 160)
+
+        cmd = "taosBenchmark -f ./5-taos-tools/taosbenchmark/json/sml_rest_line.json"
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.execute("reset query cache")
+        tdSql.query("select count(tbname) from db2.stb1")
+        tdSql.checkData(0, 0, 8)
+        tdSql.query("select count(*) from db2.stb1")
+        tdSql.checkData(0, 0, 160)
+        tdSql.query("select count(tbname) from db2.stb2")
+        tdSql.checkData(0, 0, 8)
+        tdSql.query("select count(*) from db2.stb2")
+        tdSql.checkData(0, 0, 160)
+
+        cmd = "taosBenchmark -f ./5-taos-tools/taosbenchmark/json/sml_rest_json.json"
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        tdSql.execute("reset query cache")
+        tdSql.query("select count(tbname) from db3.stb1")
+        tdSql.checkData(0, 0, 8)
+        tdSql.query("select count(*) from db3.stb1")
+        tdSql.checkData(0, 0, 160)
+        tdSql.query("select count(tbname) from db3.stb2")
+        tdSql.checkData(0, 0, 8)
+        tdSql.query("select count(*) from db3.stb2")
+        tdSql.checkData(0, 0, 160)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file
diff --git a/tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeJson.py b/tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeJson.py
index 14297ee867e0830fae8a776bfc7902e3f6ee4d9c..cf0c7f4ac594faf8e30582bd205e126b5097b9f4 100644
--- a/tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeJson.py
+++ b/tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeJson.py
@@ -40,6 +40,7 @@ class TDTestCase:
         else:
             projPath = selfPath[:selfPath.find("tests")]
 
+        buildPath = ""
         for root, dirs, files in os.walk(projPath):
             if ("taosdump" in files):
                 rootRealPath = os.path.dirname(os.path.realpath(root))
@@ -57,9 +58,20 @@ class TDTestCase:
         tdSql.execute("use db")
         tdSql.execute(
             "create table st(ts timestamp, c1 int) tags(jtag JSON)")
-        tdSql.execute("create table t1 using st tags('{\"location\": \"beijing\"}')")
+        tdSql.execute(
+            "create table t1 using st tags('{\"location\": \"beijing\"}')")
         tdSql.execute("insert into t1 values(1500000000000, 1)")
 
+        tdSql.execute(
+            "create table t2 using st tags(NULL)")
+        tdSql.execute("insert into t2 values(1500000000000, NULL)")
+
+        tdSql.execute(
+            "create table t3 using st tags('')")
+        tdSql.execute("insert into t3 values(1500000000000, 0)")
+
+#        sys.exit(1)
+
         buildPath = self.getBuildPath()
         if (buildPath == ""):
             tdLog.exit("taosdump not found!")
@@ -74,11 +86,11 @@ class TDTestCase:
             os.system("rm -rf %s" % self.tmpdir)
             os.makedirs(self.tmpdir)
 
-        os.system("%staosdump --databases db -o %s" % (binPath, self.tmpdir))
+        os.system("%staosdump --databases db -o %s -g" % (binPath, self.tmpdir))
 
         tdSql.execute("drop database db")
 
-        os.system("%staosdump -i %s" % (binPath, self.tmpdir))
+        os.system("%staosdump -i %s -g" % (binPath, self.tmpdir))
 
         tdSql.query("show databases")
         tdSql.checkRows(1)
@@ -89,11 +101,11 @@ class TDTestCase:
         tdSql.checkData(0, 0, 'st')
 
         tdSql.query("show tables")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 't1')
+        tdSql.checkRows(3)
+        tdSql.checkData(0, 0, 't3')
 
         tdSql.query("select jtag->'location' from st")
-        tdSql.checkRows(1)
+        tdSql.checkRows(3)
         tdSql.checkData(0, 0, "\"beijing\"")
 
         tdSql.query("select * from st where jtag contains 'location'")
@@ -101,6 +113,11 @@ class TDTestCase:
         tdSql.checkData(0, 1, 1)
         tdSql.checkData(0, 2, '{\"location\":\"beijing\"}')
 
+        tdSql.query("select jtag from st")
+        tdSql.checkRows(3)
+        tdSql.checkData(0, 0, "{\"location\":\"beijing\"}")
+        tdSql.checkData(1, 0, None)
+        tdSql.checkData(2, 0, None)
 
     def stop(self):
         tdSql.close()