Merge branch '3.0' into fix/TD-24567-3.0

2023-06-09 09:55:47 +08:00 · 2023-06-09 09:55:47 +08:00 · 1812b9e968
parent 79625df5e4 d2b8ef1c74
commit 1812b9e968
74 changed files with 3868 additions and 2713 deletions
--- a/cmake/cmake.version
+++ b/cmake/cmake.version
@ -2,7 +2,7 @@
 IF (DEFINED VERNUMBER)
  SET(TD_VER_NUMBER ${VERNUMBER})
 ELSE ()
-  SET(TD_VER_NUMBER "3.0.4.3")
+  SET(TD_VER_NUMBER "3.0.5.0")
 ENDIF ()
 IF (DEFINED VERCOMPATIBLE)
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@ -274,7 +274,7 @@ if(${BUILD_WITH_ROCKSDB})
    option(WITH_TOOLS "" OFF)
    option(WITH_LIBURING "" OFF)
    IF (TD_LINUX) 
-    option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" ON)
+    option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" OFF)
    ELSE()
    option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" OFF)
    ENDIF()
--- a/docs/en/12-taos-sql/06-select.md
+++ b/docs/en/12-taos-sql/06-select.md
@ -55,7 +55,7 @@ window_clause: {
  | INTERVAL(interval_val [, interval_offset]) [SLIDING (sliding_val)] [WATERMARK(watermark_val)] [FILL(fill_mod_and_val)]
 interp_clause:
-    RANGE(ts_val, ts_val) EVERY(every_val) FILL(fill_mod_and_val)
+    RANGE(ts_val [, ts_val]) EVERY(every_val) FILL(fill_mod_and_val)
 partition_by_clause:
    PARTITION BY expr [, expr] ...
--- a/docs/en/12-taos-sql/10-function.md
+++ b/docs/en/12-taos-sql/10-function.md
@ -889,9 +889,10 @@ ignore_null_values: {
 - `INTERP` is used to get the value that matches the specified time slice from a column. If no such value exists an interpolation value will be returned based on `FILL` parameter.
 - The input data of `INTERP` is the value of the specified column and a `where` clause can be used to filter the original data. If no `where` condition is specified then all original data is the input.
 - `INTERP` must be used along with `RANGE`, `EVERY`, `FILL` keywords.
- The output time range of `INTERP` is specified by `RANGE(timestamp1,timestamp2)` parameter, with timestamp1 <= timestamp2. timestamp1 is the starting point of the output time range and must be specified. timestamp2 is the ending point of the output time range and must be specified.
+- The output time range of `INTERP` is specified by `RANGE(timestamp1,timestamp2)` parameter, with timestamp1 <= timestamp2. timestamp1 is the starting point of the output time range. timestamp2 is the ending point of the output time range.
 - The number of rows in the result set of `INTERP` is determined by the parameter `EVERY(time_unit)`. Starting from timestamp1, one interpolation is performed for every time interval specified `time_unit` parameter. The parameter `time_unit` must be an integer, with no quotes, with a time unit of: a(millisecond)), s(second), m(minute), h(hour), d(day), or w(week). For example, `EVERY(500a)` will interpolate every 500 milliseconds.
 - Interpolation is performed based on `FILL` parameter. For more information about FILL clause, see [FILL Clause](../distinguished/#fill-clause).
 - When only one timestamp value is specified in `RANGE` clause, `INTERP` is used to generate interpolation at this point in time. In this case, `EVERY` clause can be omitted. For example, SELECT INTERP(col) FROM tb RANGE('2023-01-01 00:00:00') FILL(linear).
 - `INTERP` can be applied to supertable by interpolating primary key sorted data of all its childtables. It can also be used with `partition by tbname` when applied to supertable to generate interpolation on each single timeline.
 - Pseudocolumn `_irowts` can be used along with `INTERP` to return the timestamps associated with interpolation points(support after version 3.0.2.0).
 - Pseudocolumn `_isfilled` can be used along with `INTERP` to indicate whether the results are original records or data points generated by interpolation algorithm(support after version 3.0.3.0).
--- a/docs/en/14-reference/03-connector/04-java.mdx
+++ b/docs/en/14-reference/03-connector/04-java.mdx
@ -32,25 +32,22 @@ TDengine's JDBC driver implementation is as consistent as possible with the rela
 Native connections are supported on the same platforms as the TDengine client driver.
 REST connection supports all platforms that can run Java.
 ## Version support
 Please refer to [version support list](/reference/connector#version-support)
 ## Recent update logs
-| taos-jdbcdriver version |                                                                   major changes                                                                    |
+| taos-jdbcdriver version |                                                                   major changes                                                                    | TDengine version |
-| :---------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------: |
+| :---------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------: |
-|          3.2.1          |                                      JDBC REST connection supports schemaless/prepareStatement over WebSocket                                      |
+|          3.2.1          |                                                           subscription add seek function                                                           | 3.0.5.0 or later |
-|          3.2.0          |                                                          This version has been deprecated                                                          |
+|          3.2.1          |                                      JDBC REST connection supports schemaless/prepareStatement over WebSocket                                      | 3.0.3.0 or later |
-|          3.1.0          |                                             JDBC REST connection supports subscription over WebSocket                                              |
+|          3.2.0          |                                                          This version has been deprecated                                                          |        -         |
-|      3.0.1 - 3.0.4      | fix the resultSet data is parsed incorrectly sometimes. 3.0.1 is compiled on JDK 11, you are advised to use other version in the JDK 8 environment |
+|          3.1.0          |                                             JDBC REST connection supports subscription over WebSocket                                              |        -         |
-|          3.0.0          |                                                              Support for TDengine 3.0                                                              |
+|      3.0.1 - 3.0.4      | fix the resultSet data is parsed incorrectly sometimes. 3.0.1 is compiled on JDK 11, you are advised to use other version in the JDK 8 environment |        -         |
-|         2.0.42          |                                             fix wasNull interface return value in WebSocket connection                                             |
+|          3.0.0          |                                                              Support for TDengine 3.0                                                              | 3.0.0.0 or later |
-|         2.0.41          |                                           fix decode method of username and password in REST connection                                            |
+|         2.0.42          |                                             fix wasNull interface return value in WebSocket connection                                             |        -         |
-|     2.0.39 - 2.0.40     |                                                   Add REST connection/request timeout parameters                                                   |
+|         2.0.41          |                                           fix decode method of username and password in REST connection                                            |        -         |
-|         2.0.38          |                                                    JDBC REST connections add bulk pull function                                                    |
+|     2.0.39 - 2.0.40     |                                                   Add REST connection/request timeout parameters                                                   |        -         |
-|         2.0.37          |                                                                 Support json tags                                                                  |
+|         2.0.38          |                                                    JDBC REST connections add bulk pull function                                                    |        -         |
-|         2.0.36          |                                                             Support schemaless writing                                                             |
+|         2.0.37          |                                                                 Support json tags                                                                  |        -         |
 |         2.0.36          |                                                             Support schemaless writing                                                             |        -         |
 **Note**: adding `batchfetch` to the REST connection and setting it to true will enable the WebSocket connection.
@ -102,6 +99,8 @@ For specific error codes, please refer to.
 | 0x2319     | user is required                                                | The user name information is missing when creating the connection                                                                  |
 | 0x231a     | password is required                                            | Password information is missing when creating a connection                                                                         |
 | 0x231c     | httpEntity is null, sql:                                        | Execution exception occurred during the REST connection                                                                            |
 | 0x231d     | can't create connection with server within                      | Increase the connection time by adding the httpConnectTimeout parameter, or check the connection to the taos adapter.              |
 | 0x231e     | failed to complete the task within the specified time           | Increase the execution time by adding the messageWaitTimeout parameter, or check the connection to the taos adapter.               |
 | 0x2350     | unknown error                                                   | Unknown exception, please return to the developer on github.                                                                       |
 | 0x2352     | Unsupported encoding                                            | An unsupported character encoding set is specified under the native Connection.                                                    |
 | 0x2353     | internal error of database, please see taoslog for more details | An error occurs when the prepare statement is executed on the native connection. Check the taos log to locate the fault.           |
@ -117,8 +116,8 @@ For specific error codes, please refer to.
 | 0x2376     | failed to set consumer topic, topic name is empty               | During data subscription creation, the subscription topic name is empty. Check that the specified topic name is correct.           |
 | 0x2377     | consumer reference has been destroyed                           | The subscription data transfer channel has been closed. Please check the connection to TDengine.                                   |
 | 0x2378     | consumer create error                                           | Failed to create a data subscription. Check the taos log according to the error message to locate the fault.                       |
-| -          | can't create connection with server within                      | Increase the connection time by adding the httpConnectTimeout parameter, or check the connection to the taos adapter.              |
+| 0x2379     | seek offset must not be a negative number                       | The seek interface parameter cannot be negative. Use the correct parameter                                                         |
-| -          | failed to complete the task within the specified time           | Increase the execution time by adding the messageWaitTimeout parameter, or check the connection to the taos adapter.               |
+| 0x237a     | vGroup not found in result set                                  | subscription is not bound to the VGroup due to the rebalance mechanism                                                             |
 - [TDengine Java Connector](https://github.com/taosdata/taos-connector-jdbc/blob/main/src/main/java/com/taosdata/jdbc/TSDBErrorNumbers.java)
 <!-- - [TDengine_ERROR_CODE](../error-code) -->
@ -169,7 +168,7 @@ Add following dependency in the `pom.xml` file of your Maven project:
 <dependency>
 <groupId>com.taosdata.jdbc</groupId>
 <artifactId>taos-jdbcdriver</artifactId>
- <version>3.2.1</version>
+ <version>3.2.2</version>
 </dependency>
 ```
@ -913,14 +912,15 @@ public class SchemalessWsTest {
    public static void main(String[] args) throws SQLException {
        final String url = "jdbc:TAOS-RS://" + host + ":6041/?user=root&password=taosdata&batchfetch=true";
-        Connection connection = DriverManager.getConnection(url);
+        try(Connection connection = DriverManager.getConnection(url)){
            init(connection);
-        SchemalessWriter writer = new SchemalessWriter(connection, "test_ws_schemaless");
+            try(SchemalessWriter writer = new SchemalessWriter(connection, "test_ws_schemaless")){
                writer.write(lineDemo, SchemalessProtocolType.LINE, SchemalessTimestampType.NANO_SECONDS);
                writer.write(telnetDemo, SchemalessProtocolType.TELNET, SchemalessTimestampType.MILLI_SECONDS);
                writer.write(jsonDemo, SchemalessProtocolType.JSON, SchemalessTimestampType.SECONDS);
-        System.exit(0);
+            }
        }
    }
    private static void init(Connection connection) throws SQLException {
@ -991,6 +991,17 @@ while(true) {
 `poll` obtains one message each time it is run.
 #### Assignment subscription Offset
 ```
 long position(TopicPartition partition) throws SQLException;
 Map<TopicPartition, Long> position(String topic) throws SQLException;
 Map<TopicPartition, Long> beginningOffsets(String topic) throws SQLException;
 Map<TopicPartition, Long> endOffsets(String topic) throws SQLException;
 void seek(TopicPartition partition, long offset) throws SQLException;
 ```
 #### Close subscriptions
 ```java
@ -1256,6 +1267,7 @@ The source code of the sample application is under `TDengine/examples/JDBC`:
 - connectionPools: using taos-jdbcdriver in connection pools such as HikariCP, Druid, dbcp, c3p0, etc.
 - SpringJdbcTemplate: using taos-jdbcdriver in Spring JdbcTemplate.
 - mybatisplus-demo: using taos-jdbcdriver in Springboot + Mybatis.
 - consumer-demo: consumer TDengine data example, the consumption rate can be controlled by parameters.
 [JDBC example](https://github.com/taosdata/TDengine/tree/3.0/examples/JDBC)
--- a/docs/en/14-reference/03-connector/05-go.mdx
+++ b/docs/en/14-reference/03-connector/05-go.mdx
@ -29,7 +29,7 @@ REST connections are supported on all platforms that can run Go.
 ## Version support
-Please refer to [version support list](/reference/connector#version-support)
+Please refer to [version support list](https://github.com/taosdata/driver-go#remind)
 ## Supported features
@ -379,6 +379,15 @@ Note: `tmq.TopicPartition` is reserved for compatibility purpose
 Commit information.
 * `func (c *Consumer) Assignment() (partitions []tmq.TopicPartition, err error)`
 Get Assignment(TDengine >= 3.0.5.0 and driver-go >= v3.5.0 are required).
 * `func (c *Consumer) Seek(partition tmq.TopicPartition, ignoredTimeoutMs int) error`
 Note: `ignoredTimeoutMs` is reserved for compatibility purpose
 Seek offset(TDengine >= 3.0.5.0 and driver-go >= v3.5.0 are required).
 * `func (c *Consumer) Unsubscribe() error`
 Unsubscribe.
@ -468,6 +477,15 @@ Note: `tmq.TopicPartition` is reserved for compatibility purpose
 Commit information.
 * `func (c *Consumer) Assignment() (partitions []tmq.TopicPartition, err error)`
 Get Assignment(TDengine >= 3.0.5.0 and driver-go >= v3.5.0 are required).
 * `func (c *Consumer) Seek(partition tmq.TopicPartition, ignoredTimeoutMs int) error`
 Note: `ignoredTimeoutMs` is reserved for compatibility purpose
 Seek offset(TDengine >= 3.0.5.0 and driver-go >= v3.5.0 are required).
 * `func (c *Consumer) Unsubscribe() error`
 Unsubscribe.
@ -476,7 +494,7 @@ Unsubscribe.
 Close consumer.
-For a complete example see [GitHub sample file](https://github.com/taosdata/driver-go/blob/3.0/examples/tmqoverws/main.go)
+For a complete example see [GitHub sample file](https://github.com/taosdata/driver-go/blob/main/examples/tmqoverws/main.go)
 ### parameter binding via WebSocket
@ -524,7 +542,7 @@ For a complete example see [GitHub sample file](https://github.com/taosdata/driv
  Closes the parameter binding.
-For a complete example see [GitHub sample file](https://github.com/taosdata/driver-go/blob/3.0/examples/stmtoverws/main.go)
+For a complete example see [GitHub sample file](https://github.com/taosdata/driver-go/blob/main/examples/stmtoverws/main.go)
 ## API Reference
--- a/docs/en/14-reference/03-connector/06-rust.mdx
+++ b/docs/en/14-reference/03-connector/06-rust.mdx
@ -27,9 +27,14 @@ The source code for the Rust connectors is located on [GitHub](https://github.co
 Native connections are supported on the same platforms as the TDengine client driver.
 Websocket connections are supported on all platforms that can run Go.
-## Version support
+## Version history
-Please refer to [version support list](/reference/connector#version-support)
+| connector-rust version |  TDengine version |                   major features                    |
 | :----------------: | :--------------: | :--------------------------------------------------: |
 |       v0.8.10       |      3.0.5.0 or later    | TMQ: Get consuming progress and seek offset to consume. |
 |       v0.8.0       |      3.0.4.0     | Support schemaless insert. |
 |       v0.7.6       |      3.0.3.0     | Support req_id in query. |
 |       v0.6.0       |      3.0.0.0     | Base features. |
 The Rust Connector is still under rapid development and is not guaranteed to be backward compatible before 1.0. We recommend using TDengine version 3.0 or higher to avoid known issues.
@ -499,6 +504,22 @@ The TMQ is of [futures::Stream](https://docs.rs/futures/latest/futures/stream/in
 }
 ```
 Get assignments：
 Version requirements connector-rust >= v0.8.8, TDengine >= 3.0.5.0
 ```rust
 let assignments = consumer.assignments().await.unwrap();
 ```
 Seek offset：
 Version requirements connector-rust >= v0.8.8, TDengine >= 3.0.5.0
 ```rust
 consumer.offset_seek(topic, vgroup_id, offset).await;
 ```
 Unsubscribe:
 ```rust
@ -513,7 +534,7 @@ The following parameters can be configured for the TMQ DSN. Only `group.id` is m
 - `enable.auto.commit`: Automatically commits. This can be enabled when data consistency is not essential.
 - `auto.commit.interval.ms`: Interval for automatic commits.
-For more information, see [GitHub sample file](https://github.com/taosdata/taos-connector-rust/blob/main/examples/subscribe.rs).
+For more information, see [GitHub sample file](https://github.com/taosdata/TDengine/blob/3.0/docs/examples/rust/nativeexample/examples/subscribe_demo.rs).
 For information about other structure APIs, see the [Rust documentation](https://docs.rs/taos).
--- a/docs/en/20-third-party/11-kafka.md
+++ b/docs/en/20-third-party/11-kafka.md
@ -16,165 +16,79 @@ TDengine Source Connector is used to read data from TDengine in real-time and se
 ![TDengine Database Kafka Connector -- streaming integration with kafka connect](kafka/streaming-integration-with-kafka-connect.webp)
 ## What is Confluent?
 [Confluent](https://www.confluent.io/) adds many extensions to Kafka. include:
 1. Schema Registry
 2. REST Proxy
 3. Non-Java Clients
 4. Many packaged Kafka Connect plugins
 5. GUI for managing and monitoring Kafka - Confluent Control Center
 Some of these extensions are available in the community version of Confluent. Some are only available in the enterprise version.
 ![TDengine Database Kafka Connector -- Confluent platform](kafka/confluentPlatform.webp)
 Confluent Enterprise Edition provides the `confluent` command-line tool to manage various components.
 ## Prerequisites
 1. Linux operating system
 2. Java 8 and Maven installed
-3. Git is installed
+3. Git/curl/vi is installed
 4. TDengine is installed and started. If not, please refer to [Installation and Uninstallation](/operation/pkg-install)
-## Install Confluent
+## Install Kafka
 Confluent provides two installation methods: Docker and binary packages. This article only introduces binary package installation.
 Execute in any directory:
 ````
-curl -O http://packages.confluent.io/archive/7.1/confluent-7.1.1.tar.gz
+curl -O https://downloads.apache.org/kafka/3.4.0/kafka_2.13-3.4.0.tgz
-tar xzf confluent-7.1.1.tar.gz -C /opt/
+tar xzf kafka_2.13-3.4.0.tgz -C /opt/
 ln -s /opt/kafka_2.13-3.4.0 /opt/kafka
 ````
-Then you need to add the `$CONFLUENT_HOME/bin` directory to the PATH.
+Then you need to add the `$KAFKA_HOME/bin` directory to the PATH.
 ```title=".profile"
-export CONFLUENT_HOME=/opt/confluent-7.1.1
+export KAFKA_HOME=/opt/kafka
-export PATH=$CONFLUENT_HOME/bin:$PATH
+export PATH=$PATH:$KAFKA_HOME/bin
 ```
 Users can append the above script to the current user's profile file (~/.profile or ~/.bash_profile)
 After the installation is complete, you can enter `confluent version` for simple verification:
 ```
 # confluent version
 confluent - Confluent CLI
 Version:     v2.6.1
 Git Ref:     6d920590
 Build Date:  2022-02-18T06:14:21Z
 Go Version:  go1.17.6 (linux/amd64)
 Development: false
 ```
 ## Install TDengine Connector plugin
 ### Install from source code
-```
+```shell
 git clone --branch 3.0 https://github.com/taosdata/kafka-connect-tdengine.git
 cd kafka-connect-tdengine
-mvn clean package
+mvn clean package -Dmaven.test.skip=true
-unzip -d $CONFLUENT_HOME/share/java/ target/components/packages/taosdata-kafka-connect-tdengine-*.zip
+unzip -d $KAFKA_HOME/components/ target/components/packages/taosdata-kafka-connect-tdengine-*.zip
 ```
-The above script first clones the project source code and then compiles and packages it with Maven. After the package is complete, the zip package of the plugin is generated in the `target/components/packages/` directory. Unzip this zip package to plugin path. We used `$CONFLUENT_HOME/share/java/` above because it's a build in plugin path.
+The above script first clones the project source code and then compiles and packages it with Maven. After the package is complete, the zip package of the plugin is generated in the `target/components/packages/` directory. Unzip this zip package to plugin path. We used `$KAFKA_HOME/components/` above because it's a build in plugin path.
-### Install with confluent-hub
+### Add configuration file
-[Confluent Hub](https://www.confluent.io/hub) provides a service to download Kafka Connect plugins. After TDengine Kafka Connector is published to Confluent Hub, it can be installed using the command tool `confluent-hub`.
+add kafka-connect-tdengine plugin path to `plugin.path` in `$KAFKA_HOME/config/connect-distributed.properties`.
 **TDengine Kafka Connector is currently not officially released and cannot be installed in this way**.
-## Start Confluent
+```properties
-
+plugin.path=/usr/share/java,/opt/kafka/components
 ```
 confluent local services start
 ```
-:::note
+## Start Kafka Services
 Be sure to install the plugin before starting Confluent. Otherwise, Kafka Connect will fail to discover the plugins.
 :::
-:::tip
+Use command bellow to start all services:
 If a component fails to start, try clearing the data and restarting. The data directory will be printed to the console at startup, e.g.:
-```title="Console output log" {1}
+```shell
-Using CONFLUENT_CURRENT: /tmp/confluent.106668
+zookeeper-server-start.sh -daemon $KAFKA_HOME/config/zookeeper.properties
 Starting ZooKeeper
 ZooKeeper is [UP]
 Starting Kafka
 Kafka is [UP]
 Starting Schema Registry
 Schema Registry is [UP]
 Starting Kafka REST
 Kafka REST is [UP]
 Starting Connect
 Connect is [UP]
 Starting ksqlDB Server
 ksqlDB Server is [UP]
 Starting Control Center
 Control Center is [UP]
 ```
-To clear data, execute `rm -rf /tmp/confluent.106668`.
+kafka-server-start.sh -daemon $KAFKA_HOME/config/server.properties
 :::
-### Check Confluent Services Status
+connect-distributed.sh -daemon $KAFKA_HOME/config/connect-distributed.properties
 Use command bellow to check the status of all service:
 ```
 confluent local services status
 ```
 The expected output is:
 ```
 Connect is [UP]
 Control Center is [UP]
 Kafka is [UP]
 Kafka REST is [UP]
 ksqlDB Server is [UP]
 Schema Registry is [UP]
 ZooKeeper is [UP]
 ```
 ### Check Successfully Loaded Plugin
 After Kafka Connect was completely started, you can use bellow command to check if our plugins are installed successfully:
-```
+
-confluent local services connect plugin list
+```shell
 curl http://localhost:8083/connectors
 ```
-The output should contains `TDengineSinkConnector` and `TDengineSourceConnector` as bellow:
+The output as bellow:
 ```txt
 []
 ```
 Available Connect Plugins:
 [
  {
    "class": "com.taosdata.kafka.connect.sink.TDengineSinkConnector",
    "type": "sink",
    "version": "1.0.0"
  },
  {
    "class": "com.taosdata.kafka.connect.source.TDengineSourceConnector",
    "type": "source",
    "version": "1.0.0"
  },
 ......
 ```
 If not, please check the log file of Kafka Connect. To view the log file path, please execute:
 ```
 echo `cat /tmp/confluent.current`/connect/connect.stdout
 ```
 It should produce a path like:`/tmp/confluent.104086/connect/connect.stdout`
 Besides log file `connect.stdout` there is a file named `connect.properties`. At the end of this file you can see the effective `plugin.path` which is a series of paths joined by comma. If Kafka Connect not found our plugins, it's probably because the installed path is not included in `plugin.path`.
 ## The use of TDengine Sink Connector
@ -184,40 +98,47 @@ TDengine Sink Connector internally uses TDengine [modeless write interface](/ref
 The following example synchronizes the data of the topic meters to the target database power. The data format is the InfluxDB Line protocol format.
-### Add configuration file
+### Add Sink Connector configuration file
-```
+```shell
 mkdir ~/test
 cd ~/test
-vi sink-demo.properties
+vi sink-demo.json
 ```
-sink-demo.properties' content is following:
+sink-demo.json' content is following:
-```ini title="sink-demo.properties"
+```json title="sink-demo.json"
-name=TDengineSinkConnector
+{
-connector.class=com.taosdata.kafka.connect.sink.TDengineSinkConnector
+  "name": "TDengineSinkConnector",
-tasks.max=1
+  "config": {
-topics=meters
+    "connector.class":"com.taosdata.kafka.connect.sink.TDengineSinkConnector",
-connection.url=jdbc:TAOS://127.0.0.1:6030
+    "tasks.max": "1",
-connection.user=root
+    "topics": "meters",
-connection.password=taosdata
+    "connection.url": "jdbc:TAOS://127.0.0.1:6030",
-connection.database=power
+    "connection.user": "root",
-db.schemaless=line
+    "connection.password": "taosdata",
-data.precision=ns
+    "connection.database": "power",
-key.converter=org.apache.kafka.connect.storage.StringConverter
+    "db.schemaless": "line",
-value.converter=org.apache.kafka.connect.storage.StringConverter
+    "data.precision": "ns",
    "key.converter": "org.apache.kafka.connect.storage.StringConverter",
    "value.converter": "org.apache.kafka.connect.storage.StringConverter",
    "errors.tolerance": "all",
    "errors.deadletterqueue.topic.name": "dead_letter_topic",
    "errors.deadletterqueue.topic.replication.factor": 1
  }
 }
 ```
 Key configuration instructions:
-1. `topics=meters` and `connection.database=power` means to subscribe to the data of the topic meters and write to the database power.
+1. `"topics": "meters"` and `"connection.database": "power"` means to subscribe to the data of the topic meters and write to the database power.
-2. `db.schemaless=line` means the data in the InfluxDB Line protocol format.
+2. `"db.schemaless": "line"` means the data in the InfluxDB Line protocol format.
-### Create Connector instance
+### Create Sink Connector instance
-````
+````shell
-confluent local services connect connector load TDengineSinkConnector --config ./sink-demo.properties
+curl -X POST -d @sink-demo.json http://localhost:8083/connectors -H "Content-Type: application/json"
 ````
 If the above command is executed successfully, the output is as follows:
@ -237,7 +158,10 @@ If the above command is executed successfully, the output is as follows:
    "tasks.max": "1",
    "topics": "meters",
    "value.converter": "org.apache.kafka.connect.storage.StringConverter",
-    "name": "TDengineSinkConnector"
+    "name": "TDengineSinkConnector",
    "errors.tolerance": "all",
    "errors.deadletterqueue.topic.name": "dead_letter_topic",
    "errors.deadletterqueue.topic.replication.factor": "1",  
  },
  "tasks": [],
  "type": "sink"
@ -258,7 +182,7 @@ meters,location=California.LoSangeles,groupid=3 current=11.3,voltage=221,phase=0
 Use kafka-console-producer to write test data to the topic `meters`.
 ```
-cat test-data.txt | kafka-console-producer --broker-list localhost:9092 --topic meters
+cat test-data.txt | kafka-console-producer.sh --broker-list localhost:9092 --topic meters
 ```
 :::note
@ -269,12 +193,12 @@ TDengine Sink Connector will automatically create the database if the target dat
 Use the TDengine CLI to verify that the sync was successful.
-```
+```sql
 taos> use power;
 Database changed.
 taos> select * from meters;
-              ts               |          current          |          voltage          |           phase           | groupid |            location            |
+              _ts               |          current          |          voltage          |           phase           | groupid |            location            |
 ===============================================================================================================================================================
 2022-03-28 09:56:51.249000000 |              11.800000000 |             221.000000000 |               0.280000000 | 2       | California.LosAngeles          |
 2022-03-28 09:56:51.250000000 |              13.400000000 |             223.000000000 |               0.290000000 | 2       | California.LosAngeles          |
@ -293,29 +217,34 @@ TDengine Source Connector will convert the data in TDengine data table into [Inf
 The following sample program synchronizes the data in the database test to the topic tdengine-source-test.
-### Add configuration file
+### Add Source Connector configuration file
-```
+```shell
-vi source-demo.properties
+vi source-demo.json
 ```
 Input following content:
-```ini title="source-demo.properties"
+```json title="source-demo.json"
-name=TDengineSourceConnector
+{
-connector.class=com.taosdata.kafka.connect.source.TDengineSourceConnector
+  "name":"TDengineSourceConnector",
-tasks.max=1
+    "config":{
-connection.url=jdbc:TAOS://127.0.0.1:6030
+    "connector.class": "com.taosdata.kafka.connect.source.TDengineSourceConnector",
-connection.username=root
+    "tasks.max": 1,
-connection.password=taosdata
+    "connection.url": "jdbc:TAOS://127.0.0.1:6030",
-connection.database=test
+    "connection.username": "root",
-connection.attempts=3
+    "connection.password": "taosdata",
-connection.backoff.ms=5000
+    "connection.database": "test",
-topic.prefix=tdengine-source-
+    "connection.attempts": 3,
-poll.interval.ms=1000
+    "connection.backoff.ms": 5000,
-fetch.max.rows=100
+    "topic.prefix": "tdengine-source",
-key.converter=org.apache.kafka.connect.storage.StringConverter
+    "poll.interval.ms": 1000,
-value.converter=org.apache.kafka.connect.storage.StringConverter
+    "fetch.max.rows": 100,
    "topic.per.stable": true,
    "key.converter": "org.apache.kafka.connect.storage.StringConverter",
    "value.converter": "org.apache.kafka.connect.storage.StringConverter"
    }
 }
 ```
 ### Prepare test data
@ -340,40 +269,40 @@ INSERT INTO d1001 USING meters TAGS('California.SanFrancisco', 2) VALUES('2018-1
 Use TDengine CLI to execute SQL script
-```
+```shell
 taos -f prepare-source-data.sql
 ```
 ### Create Connector instance
-````
+```shell
-confluent local services connect connector load TDengineSourceConnector --config source-demo.properties
+curl -X POST -d @source-demo.json http://localhost:8083/connectors -H "Content-Type: application/json"
-````
+```
 ### View topic data
 Use the kafka-console-consumer command-line tool to monitor data in the topic tdengine-source-test. In the beginning, all historical data will be output. After inserting two new data into TDengine, kafka-console-consumer immediately outputs the two new data. The output is in InfluxDB line protocol format.
-````
+````shell
-kafka-console-consumer --bootstrap-server localhost:9092 --from-beginning --topic tdengine-source-test
+kafka-console-consumer.sh --bootstrap-server localhost:9092 --from-beginning --topic tdengine-source-test-meters
 ````
 output:
-````
+```txt
 ......
 meters,location="California.SanFrancisco",groupid=2i32 current=10.3f32,voltage=219i32,phase=0.31f32 1538548685000000000
 meters,location="California.SanFrancisco",groupid=2i32 current=12.6f32,voltage=218i32,phase=0.33f32 1538548695000000000
 ......
-````
+```
 All historical data is displayed. Switch to the TDengine CLI and insert two new pieces of data:
-````
+```sql
 USE test;
 INSERT INTO d1001 VALUES (now, 13.3, 229, 0.38);
 INSERT INTO d1002 VALUES (now, 16.3, 233, 0.22);
-````
+```
 Switch back to kafka-console-consumer, and the command line window has printed out the two pieces of data just inserted.
@ -383,16 +312,16 @@ After testing, use the unload command to stop the loaded connector.
 View currently active connectors:
-````
+```shell
-confluent local services connect connector status
+curl http://localhost:8083/connectors
-````
+```
 You should now have two active connectors if you followed the previous steps. Use the following command to unload:
-````
+```shell
-confluent local services connect connector unload TDengineSinkConnector
+curl -X DELETE http://localhost:8083/connectors/TDengineSinkConnector
-confluent local services connect connector unload TDengineSourceConnector
+curl -X DELETE http://localhost:8083/connectors/TDengineSourceConnector
-````
+```
 ## Configuration reference
@ -430,19 +359,14 @@ The following configuration items apply to TDengine Sink Connector and TDengine
 6. `query.interval.ms`: The time range of reading data from TDengine each time, its unit is millisecond. It should be adjusted according to the data flow in rate, the default value is 1000.
 7. `topic.per.stable`: If it's set to true, it means one super table in TDengine corresponds to a topic in Kafka, the topic naming rule is `<topic.prefix>-<connection.database>-<stable.name>`; if it's set to false, it means the whole DB corresponds to a topic in Kafka, the topic naming rule is `<topic.prefix>-<connection.database>`.
 ## Other notes
-1. To install plugin to a customized location, refer to https://docs.confluent.io/home/connect/self-managed/install.html#install-connector-manually.
+1. To use Kafka Connect, refer to <https://kafka.apache.org/documentation/#connect>.
 2. To use Kafka Connect without confluent, refer to  https://kafka.apache.org/documentation/#connect.
 ## Feedback
-https://github.com/taosdata/kafka-connect-tdengine/issues
+<https://github.com/taosdata/kafka-connect-tdengine/issues>
 ## Reference
-1. https://www.confluent.io/what-is-apache-kafka
+1. For more information, see <https://kafka.apache.org/documentation/>
 2. https://developer.confluent.io/learn-kafka/kafka-connect/intro
 3. https://docs.confluent.io/platform/current/platform.html
--- a/docs/en/28-releases/01-tdengine.md
+++ b/docs/en/28-releases/01-tdengine.md
@ -10,6 +10,10 @@ For TDengine 2.x installation packages by version, please visit [here](https://w
 import Release from "/components/ReleaseV3";
 ## 3.0.5.0
 <Release type="tdengine" version="3.0.5.0" />
 ## 3.0.4.2
 <Release type="tdengine" version="3.0.4.2" />
--- a/docs/en/28-releases/02-tools.md
+++ b/docs/en/28-releases/02-tools.md
@ -10,6 +10,10 @@ For other historical version installers, please visit [here](https://www.taosdat
 import Release from "/components/ReleaseV3";
 ## 2.5.1
 <Release type="tools" version="2.5.1" />
 ## 2.5.0
 <Release type="tools" version="2.5.0" />
--- a/docs/zh/08-connector/14-java.mdx
+++ b/docs/zh/08-connector/14-java.mdx
@ -32,25 +32,22 @@ TDengine 的 JDBC 驱动实现尽可能与关系型数据库驱动保持一致
 原生连接支持的平台和 TDengine 客户端驱动支持的平台一致。
 REST 连接支持所有能运行 Java 的平台。
-## 版本支持
+## 版本历史
-请参考[版本支持列表](../#版本支持)
+| taos-jdbcdriver 版本 |                                                                        主要变化                                                                        |   TDengine 版本    |
-
+| :------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------: |
-## 最近更新记录
+|        3.2.2         |                                                           新增功能：数据订阅支持 seek 功能。                                                           | 3.0.5.0 及更高版本 |
-
+|        3.2.1         | 新增功能：WebSocket 连接支持 schemaless 与 prepareStatement 写入。变更：consumer poll 返回结果集为 ConsumerRecord，可通过 value() 获取指定结果集数据。 | 3.0.3.0 及更高版本 |
-| taos-jdbcdriver 版本 |                                                                        主要变化                                                                        |
+|        3.2.0         |                                                                存在连接问题，不推荐使用                                                                |         -          |
-| :------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------: |
+|        3.1.0         |                                                               WebSocket 连接支持订阅功能                                                               |         -          |
-|        3.2.1         | 新增功能：WebSocket 连接支持 schemaless 与 prepareStatement 写入。变更：consumer poll 返回结果集为 ConsumerRecord，可通过 value() 获取指定结果集数据。 |
+|    3.0.1 - 3.0.4     |                             修复一些情况下结果集数据解析错误的问题。3.0.1 在 JDK 11 环境编译，JDK 8 环境下建议使用其他版本                             |         -          |
-|        3.2.0         |                                                                存在连接问题，不推荐使用                                                                |
+|        3.0.0         |                                                                   支持 TDengine 3.0                                                                    | 3.0.0.0 及更高版本 |
-|        3.1.0         |                                                               WebSocket 连接支持订阅功能                                                               |
+|        2.0.42        |                                                        修在 WebSocket 连接中 wasNull 接口返回值                                                        |         -          |
-|    3.0.1 - 3.0.4     |                             修复一些情况下结果集数据解析错误的问题。3.0.1 在 JDK 11 环境编译，JDK 8 环境下建议使用其他版本                             |
+|        2.0.41        |                                                          修正 REST 连接中用户名和密码转码方式                                                          |         -          |
-|        3.0.0         |                                                                   支持 TDengine 3.0                                                                    |
+|   2.0.39 - 2.0.40    |                                                              增加 REST 连接/请求 超时设置                                                              |         -          |
-|        2.0.42        |                                                        修在 WebSocket 连接中 wasNull 接口返回值                                                        |
+|        2.0.38        |                                                             JDBC REST 连接增加批量拉取功能                                                             |         -          |
-|        2.0.41        |                                                          修正 REST 连接中用户名和密码转码方式                                                          |
+|        2.0.37        |                                                                  增加对 json tag 支持                                                                  |         -          |
-|   2.0.39 - 2.0.40    |                                                              增加 REST 连接/请求 超时设置                                                              |
+|        2.0.36        |                                                               增加对 schemaless 写入支持                                                               |         -          |
 |        2.0.38        |                                                             JDBC REST 连接增加批量拉取功能                                                             |
 |        2.0.37        |                                                                  增加对 json tag 支持                                                                  |
 |        2.0.36        |                                                               增加对 schemaless 写入支持                                                               |
 **注**：REST 连接中增加 `batchfetch` 参数并设置为 true，将开启 WebSocket 连接。
@ -81,7 +78,7 @@ JDBC 连接器可能报错的错误码包括 4 种：
 具体的错误码请参考：
 | Error Code | Description                                                     | Suggested Actions                                                                         |
-| ---------- | --------------------------------------------------------------- | --------------------------------------------------------------------------------------- |
+| ---------- | --------------------------------------------------------------- | ----------------------------------------------------------------------------------------- |
 | 0x2301     | connection already closed                                       | 连接已经关闭，检查连接情况，或重新创建连接去执行相关指令。                                |
 | 0x2302     | this operation is NOT supported currently!                      | 当前使用接口不支持，可以更换其他连接方式。                                                |
 | 0x2303     | invalid variables                                               | 参数不合法，请检查相应接口规范，调整参数类型及大小。                                      |
@ -102,6 +99,8 @@ JDBC 连接器可能报错的错误码包括 4 种：
 | 0x2319     | user is required                                                | 创建连接时缺少用户名信息                                                                  |
 | 0x231a     | password is required                                            | 创建连接时缺少密码信息                                                                    |
 | 0x231c     | httpEntity is null, sql:                                        | REST 连接中执行出现异常                                                                   |
 | 0x231d     | can't create connection with server within                      | 通过增加参数 httpConnectTimeout 增加连接耗时，或是请检查与 taosAdapter 之间的连接情况。   |
 | 0x231e     | failed to complete the task within the specified time           | 通过增加参数 messageWaitTimeout 增加执行耗时，或是请检查与 taosAdapter 之间的连接情况。   |
 | 0x2350     | unknown error                                                   | 未知异常，请在 github 反馈给开发人员。                                                    |
 | 0x2352     | Unsupported encoding                                            | 本地连接下指定了不支持的字符编码集                                                        |
 | 0x2353     | internal error of database, please see taoslog for more details | 本地连接执行 prepareStatement 时出现错误，请检查 taos log 进行问题定位。                  |
@ -117,8 +116,8 @@ JDBC 连接器可能报错的错误码包括 4 种：
 | 0x2376     | failed to set consumer topic, topic name is empty               | 创建数据订阅过程中，订阅 topic 名称为空。请检查指定的 topic 名称是否填写正确。            |
 | 0x2377     | consumer reference has been destroyed                           | 订阅数据传输通道已经关闭，请检查与 TDengine 的连接情况。                                  |
 | 0x2378     | consumer create error                                           | 创建数据订阅失败，请根据错误信息检查 taos log 进行问题定位。                              |
-| -          | can't create connection with server within                      | 通过增加参数 httpConnectTimeout 增加连接耗时，或是请检查与 taosAdapter 之间的连接情况。 |
+| 0x2379     | seek offset must not be a negative number                       | seek 接口参数不能为负值，请使用正确的参数                                                 |
-| -          | failed to complete the task within the specified time           | 通过增加参数 messageWaitTimeout 增加执行耗时，或是请检查与 taosAdapter 之间的连接情况。 |
+| 0x237a     | vGroup not found in result set                                  | VGroup 没有分配给当前 consumer，由于 Rebalance 机制导致 Consumer 与 VGroup 不是绑定的关系 |
 - [TDengine Java Connector](https://github.com/taosdata/taos-connector-jdbc/blob/main/src/main/java/com/taosdata/jdbc/TSDBErrorNumbers.java)
 <!-- - [TDengine_ERROR_CODE](../error-code) -->
@ -169,7 +168,7 @@ Maven 项目中，在 pom.xml 中添加以下依赖：
 <dependency>
  <groupId>com.taosdata.jdbc</groupId>
  <artifactId>taos-jdbcdriver</artifactId>
-  <version>3.2.1</version>
+  <version>3.2.2</version>
 </dependency>
 ```
@ -916,14 +915,15 @@ public class SchemalessWsTest {
    public static void main(String[] args) throws SQLException {
        final String url = "jdbc:TAOS-RS://" + host + ":6041/?user=root&password=taosdata&batchfetch=true";
-        Connection connection = DriverManager.getConnection(url);
+        try(Connection connection = DriverManager.getConnection(url)){
            init(connection);
-        SchemalessWriter writer = new SchemalessWriter(connection, "test_ws_schemaless");
+            try(SchemalessWriter writer = new SchemalessWriter(connection, "test_ws_schemaless")){
                writer.write(lineDemo, SchemalessProtocolType.LINE, SchemalessTimestampType.NANO_SECONDS);
                writer.write(telnetDemo, SchemalessProtocolType.TELNET, SchemalessTimestampType.MILLI_SECONDS);
                writer.write(jsonDemo, SchemalessProtocolType.JSON, SchemalessTimestampType.SECONDS);
-        System.exit(0);
+            }
        }
    }
    private static void init(Connection connection) throws SQLException {
@ -994,6 +994,17 @@ while(true) {
 `poll` 每次调用获取一个消息。
 #### 指定订阅 Offset
 ```
 long position(TopicPartition partition) throws SQLException;
 Map<TopicPartition, Long> position(String topic) throws SQLException;
 Map<TopicPartition, Long> beginningOffsets(String topic) throws SQLException;
 Map<TopicPartition, Long> endOffsets(String topic) throws SQLException;
 void seek(TopicPartition partition, long offset) throws SQLException;
 ```
 #### 关闭订阅
 ```java
@ -1258,6 +1269,7 @@ public static void main(String[] args) throws Exception {
 - connectionPools：HikariCP, Druid, dbcp, c3p0 等连接池中使用 taos-jdbcdriver。
 - SpringJdbcTemplate：Spring JdbcTemplate 中使用 taos-jdbcdriver。
 - mybatisplus-demo：Springboot + Mybatis 中使用 taos-jdbcdriver。
 - consumer-demo：Consumer 消费 TDengine 数据示例，可通过参数控制消费速度。
 请参考：[JDBC example](https://github.com/taosdata/TDengine/tree/3.0/examples/JDBC)
--- a/docs/zh/08-connector/20-go.mdx
+++ b/docs/zh/08-connector/20-go.mdx
@ -30,7 +30,7 @@ REST 连接支持所有能运行 Go 的平台。
 ## 版本支持
-请参考[版本支持列表](../#版本支持)
+请参考[版本支持列表](https://github.com/taosdata/driver-go#remind)
 ## 支持的功能特性
@ -383,6 +383,15 @@ func main() {
 提交消息。
 * `func (c *Consumer) Assignment() (partitions []tmq.TopicPartition, err error)`
 获取消费进度。(需要 TDengine >= 3.0.5.0， driver-go >= v3.5.0)
 * `func (c *Consumer) Seek(partition tmq.TopicPartition, ignoredTimeoutMs int) error`
 注意：出于兼容目的保留 `ignoredTimeoutMs` 参数，当前未使用
 按照指定的进度消费。(需要 TDengine >= 3.0.5.0， driver-go >= v3.5.0)
 * `func (c *Consumer) Close() error`
 关闭连接。
@ -468,11 +477,20 @@ func main() {
 提交消息。
 * `func (c *Consumer) Assignment() (partitions []tmq.TopicPartition, err error)`
 获取消费进度。(需要 TDengine >= 3.0.5.0， driver-go >= v3.5.0)
 * `func (c *Consumer) Seek(partition tmq.TopicPartition, ignoredTimeoutMs int) error`
 注意：出于兼容目的保留 `ignoredTimeoutMs` 参数，当前未使用
 按照指定的进度消费。(需要 TDengine >= 3.0.5.0， driver-go >= v3.5.0)
 * `func (c *Consumer) Close() error`
 关闭连接。
-完整订阅示例参见 [GitHub 示例文件](https://github.com/taosdata/driver-go/blob/3.0/examples/tmqoverws/main.go)
+完整订阅示例参见 [GitHub 示例文件](https://github.com/taosdata/driver-go/blob/main/examples/tmqoverws/main.go)
 ### 通过 WebSocket 进行参数绑定
@ -520,7 +538,7 @@ func main() {
  结束参数绑定。
-完整参数绑定示例参见 [GitHub 示例文件](https://github.com/taosdata/driver-go/blob/3.0/examples/stmtoverws/main.go)
+完整参数绑定示例参见 [GitHub 示例文件](https://github.com/taosdata/driver-go/blob/main/examples/stmtoverws/main.go)
 ## API 参考
--- a/docs/zh/08-connector/26-rust.mdx
+++ b/docs/zh/08-connector/26-rust.mdx
@ -26,9 +26,14 @@ import RustQuery from "../07-develop/04-query-data/_rust.mdx"
 原生连接支持的平台和 TDengine 客户端驱动支持的平台一致。
 Websocket 连接支持所有能运行 Rust 的平台。
-## 版本支持
+## 版本历史
-请参考[版本支持列表](../#版本支持)
+|   Rust 连接器版本   |   TDengine 版本   |                        主要功能                       |
 | :----------------: | :--------------: | :--------------------------------------------------: |
 |       v0.8.10       |      3.0.5.0 or later    | 消息订阅：获取消费进度及按照指定进度开始消费。 |
 |       v0.8.0       |      3.0.4.0     | 支持无模式写入。 |
 |       v0.7.6       |      3.0.3.0     | 支持在请求中使用 req_id。 |
 |       v0.6.0       |      3.0.0.0     | 基础功能。 |
 Rust 连接器仍然在快速开发中，1.0 之前无法保证其向后兼容。建议使用 3.0 版本以上的 TDengine，以避免已知问题。
@ -502,6 +507,22 @@ TMQ 消息队列是一个 [futures::Stream](https://docs.rs/futures/latest/futur
 }
 ```
 获取消费进度：
 版本要求 connector-rust >= v0.8.8， TDengine >= 3.0.5.0
 ```rust
 let assignments = consumer.assignments().await.unwrap();
 ```
 按照指定的进度消费：
 版本要求 connector-rust >= v0.8.8， TDengine >= 3.0.5.0
 ```rust
 consumer.offset_seek(topic, vgroup_id, offset).await;
 ```
 停止订阅：
 ```rust
@ -516,7 +537,7 @@ consumer.unsubscribe().await;
 - `enable.auto.commit`: 当设置为 `true` 时，将启用自动标记模式，当对数据一致性不敏感时，可以启用此方式。
 - `auto.commit.interval.ms`: 自动标记的时间间隔。
-完整订阅示例参见 [GitHub 示例文件](https://github.com/taosdata/taos-connector-rust/blob/main/examples/subscribe.rs).
+完整订阅示例参见 [GitHub 示例文件](https://github.com/taosdata/TDengine/blob/3.0/docs/examples/rust/nativeexample/examples/subscribe_demo.rs).
 其他相关结构体 API 使用说明请移步 Rust 文档托管网页：<https://docs.rs/taos>。
--- a/docs/zh/12-taos-sql/06-select.md
+++ b/docs/zh/12-taos-sql/06-select.md
@ -55,7 +55,7 @@ window_clause: {
  | INTERVAL(interval_val [, interval_offset]) [SLIDING (sliding_val)] [WATERMARK(watermark_val)] [FILL(fill_mod_and_val)]
 interp_clause:
-    RANGE(ts_val, ts_val) EVERY(every_val) FILL(fill_mod_and_val)
+    RANGE(ts_val [, ts_val]) EVERY(every_val) FILL(fill_mod_and_val)
 partition_by_clause:
    PARTITION BY expr [, expr] ...
--- a/docs/zh/12-taos-sql/10-function.md
+++ b/docs/zh/12-taos-sql/10-function.md
@ -890,9 +890,10 @@ ignore_null_values: {
 - INTERP 用于在指定时间断面获取指定列的记录值，如果该时间断面不存在符合条件的行数据，那么会根据 FILL 参数的设定进行插值。
 - INTERP 的输入数据为指定列的数据，可以通过条件语句（where 子句）来对原始列数据进行过滤，如果没有指定过滤条件则输入为全部数据。
 - INTERP 需要同时与 RANGE，EVERY 和 FILL 关键字一起使用。
- INTERP 的输出时间范围根据 RANGE(timestamp1,timestamp2)字段来指定，需满足 timestamp1 <= timestamp2。其中 timestamp1（必选值）为输出时间范围的起始值，即如果 timestamp1 时刻符合插值条件则 timestamp1 为输出的第一条记录，timestamp2（必选值）为输出时间范围的结束值，即输出的最后一条记录的 timestamp 不能大于 timestamp2。
+- INTERP 的输出时间范围根据 RANGE(timestamp1, timestamp2)字段来指定，需满足 timestamp1 <= timestamp2。其中 timestamp1 为输出时间范围的起始值，即如果 timestamp1 时刻符合插值条件则 timestamp1 为输出的第一条记录，timestamp2 为输出时间范围的结束值，即输出的最后一条记录的 timestamp 不能大于 timestamp2。
 - INTERP 根据 EVERY(time_unit) 字段来确定输出时间范围内的结果条数，即从 timestamp1 开始每隔固定长度的时间（time_unit 值）进行插值，time_unit 可取值时间单位：1a(毫秒)，1s(秒)，1m(分)，1h(小时)，1d(天)，1w(周)。例如 EVERY(500a) 将对于指定数据每500毫秒间隔进行一次插值.
 - INTERP 根据 FILL 字段来决定在每个符合输出条件的时刻如何进行插值。关于 FILL 子句如何使用请参考 [FILL 子句](../distinguished/#fill-子句)
 - INTERP 可以在 RANGE 字段中只指定唯一的时间戳对单个时间点进行插值，在这种情况下，EVERY 字段可以省略。例如：SELECT INTERP(col) FROM tb RANGE('2023-01-01 00:00:00') FILL(linear).
 - INTERP 作用于超级表时, 会将该超级表下的所有子表数据按照主键列排序后进行插值计算，也可以搭配 PARTITION BY tbname 使用，将结果强制规约到单个时间线。
 - INTERP 可以与伪列 _irowts 一起使用，返回插值点所对应的时间戳(3.0.2.0版本以后支持)。
 - INTERP 可以与伪列 _isfilled 一起使用，显示返回结果是否为原始记录或插值算法产生的数据(3.0.3.0版本以后支持)。
--- a/docs/zh/20-third-party/11-kafka.md
+++ b/docs/zh/20-third-party/11-kafka.md
@ -16,169 +16,78 @@ TDengine Source Connector 用于把数据实时地从 TDengine 读出来发送
 ![TDengine Database Kafka Connector -- streaming integration with kafka connect](kafka/streaming-integration-with-kafka-connect.webp)
 ## 什么是 Confluent？
 [Confluent](https://www.confluent.io/) 在 Kafka 的基础上增加很多扩展功能。包括：
 1. Schema Registry
 2. REST 代理
 3. 非 Java 客户端
 4. 很多打包好的 Kafka Connect 插件
 5. 管理和监控 Kafka 的 GUI —— Confluent 控制中心
 这些扩展功能有的包含在社区版本的 Confluent 中，有的只有企业版能用。
 ![TDengine Database Kafka Connector -- Confluent introduction](kafka/confluentPlatform.webp)
 Confluent 企业版提供了 `confluent` 命令行工具管理各个组件。
 ## 前置条件
 运行本教程中示例的前提条件。
 1. Linux 操作系统
 2. 已安装 Java 8 和 Maven
-3. 已安装 Git
+3. 已安装 Git、curl、vi
 4. 已安装并启动 TDengine。如果还没有可参考[安装和卸载](/operation/pkg-install)
-## 安装 Confluent
+## 安装 Kafka
 Confluent 提供了 Docker 和二进制包两种安装方式。本文仅介绍二进制包方式安装。
 在任意目录下执行：
-```
+```shell
-curl -O http://packages.confluent.io/archive/7.1/confluent-7.1.1.tar.gz
+curl -O https://downloads.apache.org/kafka/3.4.0/kafka_2.13-3.4.0.tgz
-tar xzf confluent-7.1.1.tar.gz -C /opt/
+tar xzf kafka_2.13-3.4.0.tgz -C /opt/
 ln -s /opt/kafka_2.13-3.4.0 /opt/kafka
 ```
-然后需要把 `$CONFLUENT_HOME/bin` 目录加入 PATH。
+然后需要把 `$KAFKA_HOME/bin` 目录加入 PATH。
 ```title=".profile"
-export CONFLUENT_HOME=/opt/confluent-7.1.1
+export KAFKA_HOME=/opt/kafka
-export PATH=$CONFLUENT_HOME/bin:$PATH
+export PATH=$PATH:$KAFKA_HOME/bin
 ```
 以上脚本可以追加到当前用户的 profile 文件（~/.profile 或 ~/.bash_profile）
 安装完成之后，可以输入`confluent version`做简单验证：
 ```
 # confluent version
 confluent - Confluent CLI
 Version:     v2.6.1
 Git Ref:     6d920590
 Build Date:  2022-02-18T06:14:21Z
 Go Version:  go1.17.6 (linux/amd64)
 Development: false
 ```
 ## 安装 TDengine Connector 插件
-### 从源码安装
+### 编译插件
-```
+```shell
 git clone --branch 3.0 https://github.com/taosdata/kafka-connect-tdengine.git
 cd kafka-connect-tdengine
-mvn clean package
+mvn clean package -Dmaven.test.skip=true
-unzip -d $CONFLUENT_HOME/share/java/ target/components/packages/taosdata-kafka-connect-tdengine-*.zip
+unzip -d $KAFKA_HOME/components/ target/components/packages/taosdata-kafka-connect-tdengine-*.zip
 ```
-以上脚本先 clone 项目源码，然后用 Maven 编译打包。打包完成后在 `target/components/packages/` 目录生成了插件的 zip 包。把这个 zip 包解压到安装插件的路径即可。上面的示例中使用了内置的插件安装路径： `$CONFLUENT_HOME/share/java/`。
+以上脚本先 clone 项目源码，然后用 Maven 编译打包。打包完成后在 `target/components/packages/` 目录生成了插件的 zip 包。把这个 zip 包解压到安装插件的路径即可。上面的示例中使用了内置的插件安装路径： `$KAFKA_HOME/components/`。
-### 用 confluent-hub 安装
+### 配置插件
-[Confluent Hub](https://www.confluent.io/hub) 提供下载 Kafka Connect 插件的服务。在 TDengine Kafka Connector 发布到 Confluent Hub 后可以使用命令工具 `confluent-hub` 安装。
+将 kafka-connect-tdengine 插件加入 `$KAFKA_HOME/config/connect-distributed.properties` 配置文件 plugin.path 中
 **TDengine Kafka Connector 目前没有正式发布，不能用这种方式安装**。
-## 启动 Confluent
+```properties
-
+plugin.path=/usr/share/java,/opt/kafka/components
 ```
 confluent local services start
 ```
-:::note
+## 启动 Kafka
 一定要先安装插件再启动 Confluent, 否则加载插件会失败。
 :::
-:::tip
+```shell
-若某组件启动失败，可尝试清空数据，重新启动。数据目录在启动时将被打印到控制台，比如 ：
+zookeeper-server-start.sh -daemon $KAFKA_HOME/config/zookeeper.properties
-```title="控制台输出日志" {1}
+kafka-server-start.sh -daemon $KAFKA_HOME/config/server.properties
-Using CONFLUENT_CURRENT: /tmp/confluent.106668
+
-Starting ZooKeeper
+connect-distributed.sh -daemon $KAFKA_HOME/config/connect-distributed.properties
 ZooKeeper is [UP]
 Starting Kafka
 Kafka is [UP]
 Starting Schema Registry
 Schema Registry is [UP]
 Starting Kafka REST
 Kafka REST is [UP]
 Starting Connect
 Connect is [UP]
 Starting ksqlDB Server
 ksqlDB Server is [UP]
 Starting Control Center
 Control Center is [UP]
 ```
-清空数据可执行 `rm -rf /tmp/confluent.106668`。
+### 验证 kafka Connect 是否启动成功
 :::
 ### 验证各个组件是否启动成功
 输入命令：
-```
+```shell
-confluent local services status
+curl http://localhost:8083/connectors
 ```
 如果各组件都启动成功，会得到如下输出：
 ```txt
 []
 ```
 Connect is [UP]
 Control Center is [UP]
 Kafka is [UP]
 Kafka REST is [UP]
 ksqlDB Server is [UP]
 Schema Registry is [UP]
 ZooKeeper is [UP]
 ```
 ### 验证插件是否安装成功
 在 Kafka Connect 组件完全启动后，可用以下命令列出成功加载的插件：
 ```
 confluent local services connect plugin list
 ```
 如果成功安装，会输出如下：
 ```txt {4,9}
 Available Connect Plugins:
 [
  {
    "class": "com.taosdata.kafka.connect.sink.TDengineSinkConnector",
    "type": "sink",
    "version": "1.0.0"
  },
  {
    "class": "com.taosdata.kafka.connect.source.TDengineSourceConnector",
    "type": "source",
    "version": "1.0.0"
  },
 ......
 ```
 如果插件安装失败，请检查 Kafka Connect 的启动日志是否有异常信息，用以下命令输出日志路径：
 ```
 echo `cat /tmp/confluent.current`/connect/connect.stdout
 ```
 该命令的输出类似： `/tmp/confluent.104086/connect/connect.stdout`。
 与日志文件 `connect.stdout` 同一目录，还有一个文件名为： `connect.properties`。在这个文件的末尾，可以看到最终生效的 `plugin.path`， 它是一系列用逗号分割的路径。如果插件安装失败，很可能是因为实际的安装路径不包含在 `plugin.path` 中。
 ## TDengine Sink Connector 的使用
@ -188,40 +97,47 @@ TDengine Sink Connector 内部使用 TDengine [无模式写入接口](../../conn
 下面的示例将主题 meters 的数据，同步到目标数据库 power。数据格式为 InfluxDB Line 协议格式。
-### 添加配置文件
+### 添加 Sink Connector 配置文件
-```
+```shell
 mkdir ~/test
 cd ~/test
-vi sink-demo.properties
+vi sink-demo.json
 ```
-sink-demo.properties 内容如下：
+sink-demo.json 内容如下：
-```ini title="sink-demo.properties"
+```json title="sink-demo.json"
-name=TDengineSinkConnector
+{
-connector.class=com.taosdata.kafka.connect.sink.TDengineSinkConnector
+  "name": "TDengineSinkConnector",
-tasks.max=1
+  "config": {
-topics=meters
+    "connector.class":"com.taosdata.kafka.connect.sink.TDengineSinkConnector",
-connection.url=jdbc:TAOS://127.0.0.1:6030
+    "tasks.max": "1",
-connection.user=root
+    "topics": "meters",
-connection.password=taosdata
+    "connection.url": "jdbc:TAOS://127.0.0.1:6030",
-connection.database=power
+    "connection.user": "root",
-db.schemaless=line
+    "connection.password": "taosdata",
-data.precision=ns
+    "connection.database": "power",
-key.converter=org.apache.kafka.connect.storage.StringConverter
+    "db.schemaless": "line",
-value.converter=org.apache.kafka.connect.storage.StringConverter
+    "data.precision": "ns",
    "key.converter": "org.apache.kafka.connect.storage.StringConverter",
    "value.converter": "org.apache.kafka.connect.storage.StringConverter",
    "errors.tolerance": "all",
    "errors.deadletterqueue.topic.name": "dead_letter_topic",
    "errors.deadletterqueue.topic.replication.factor": 1
  }
 }
 ```
 关键配置说明：
-1. `topics=meters` 和 `connection.database=power`, 表示订阅主题 meters 的数据，并写入数据库 power。
+1. `"topics": "meters"` 和 `"connection.database": "power"`, 表示订阅主题 meters 的数据，并写入数据库 power。
-2. `db.schemaless=line`, 表示使用 InfluxDB Line 协议格式的数据。
+2. `"db.schemaless": "line"`, 表示使用 InfluxDB Line 协议格式的数据。
-### 创建 Connector 实例
+### 创建 Sink Connector 实例
-```
+```shell
-confluent local services connect connector load TDengineSinkConnector --config ./sink-demo.properties
+curl -X POST -d @sink-demo.json http://localhost:8083/connectors -H "Content-Type: application/json"
 ```
 若以上命令执行成功，则有如下输出：
@ -241,7 +157,10 @@ confluent local services connect connector load TDengineSinkConnector --config .
    "tasks.max": "1",
    "topics": "meters",
    "value.converter": "org.apache.kafka.connect.storage.StringConverter",
-    "name": "TDengineSinkConnector"
+    "name": "TDengineSinkConnector",
    "errors.tolerance": "all",
    "errors.deadletterqueue.topic.name": "dead_letter_topic",
    "errors.deadletterqueue.topic.replication.factor": "1",    
  },
  "tasks": [],
  "type": "sink"
@ -261,8 +180,8 @@ meters,location=California.LosAngeles,groupid=3 current=11.3,voltage=221,phase=0
 使用 kafka-console-producer 向主题 meters 添加测试数据。
-```
+```shell
-cat test-data.txt | kafka-console-producer --broker-list localhost:9092 --topic meters
+cat test-data.txt | kafka-console-producer.sh --broker-list localhost:9092 --topic meters
 ```
 :::note
@ -273,12 +192,12 @@ cat test-data.txt | kafka-console-producer --broker-list localhost:9092 --topic
 使用 TDengine CLI 验证同步是否成功。
-```
+```sql
 taos> use power;
 Database changed.
 taos> select * from meters;
-              ts               |          current          |          voltage          |           phase           | groupid |            location            |
+              _ts               |          current          |          voltage          |           phase           | groupid |            location            |
 ===============================================================================================================================================================
 2022-03-28 09:56:51.249000000 |              11.800000000 |             221.000000000 |               0.280000000 | 2       | California.LosAngeles          |
 2022-03-28 09:56:51.250000000 |              13.400000000 |             223.000000000 |               0.290000000 | 2       | California.LosAngeles          |
@ -297,29 +216,34 @@ TDengine Source Connector 会将 TDengine 数据表中的数据转换成 [Influx
 下面的示例程序同步数据库 test 中的数据到主题 tdengine-source-test。
-### 添加配置文件
+### 添加 Source Connector 配置文件
-```
+```shell
-vi source-demo.properties
+vi source-demo.json
 ```
 输入以下内容：
-```ini title="source-demo.properties"
+```json title="source-demo.json"
-name=TDengineSourceConnector
+{
-connector.class=com.taosdata.kafka.connect.source.TDengineSourceConnector
+  "name":"TDengineSourceConnector",
-tasks.max=1
+    "config":{
-connection.url=jdbc:TAOS://127.0.0.1:6030
+    "connector.class": "com.taosdata.kafka.connect.source.TDengineSourceConnector",
-connection.username=root
+    "tasks.max": 1,
-connection.password=taosdata
+    "connection.url": "jdbc:TAOS://127.0.0.1:6030",
-connection.database=test
+    "connection.username": "root",
-connection.attempts=3
+    "connection.password": "taosdata",
-connection.backoff.ms=5000
+    "connection.database": "test",
-topic.prefix=tdengine-source-
+    "connection.attempts": 3,
-poll.interval.ms=1000
+    "connection.backoff.ms": 5000,
-fetch.max.rows=100
+    "topic.prefix": "tdengine-source",
-key.converter=org.apache.kafka.connect.storage.StringConverter
+    "poll.interval.ms": 1000,
-value.converter=org.apache.kafka.connect.storage.StringConverter
+    "fetch.max.rows": 100,
    "topic.per.stable": true,
    "key.converter": "org.apache.kafka.connect.storage.StringConverter",
    "value.converter": "org.apache.kafka.connect.storage.StringConverter"
    }
 }
 ```
 ### 准备测试数据
@ -344,27 +268,27 @@ INSERT INTO d1001 USING meters TAGS('California.SanFrancisco', 2) VALUES('2018-1
 使用 TDengine CLI, 执行 SQL 文件。
-```
+```shell
 taos -f prepare-source-data.sql
 ```
-### 创建 Connector 实例
+### 创建 Source Connector 实例
-```
+```shell
-confluent local services connect connector load TDengineSourceConnector --config source-demo.properties
+curl -X POST -d @source-demo.json http://localhost:8083/connectors -H "Content-Type: application/json"
 ```
 ### 查看 topic 数据
 使用 kafka-console-consumer 命令行工具监控主题 tdengine-source-test 中的数据。一开始会输出所有历史数据， 往 TDengine 插入两条新的数据之后，kafka-console-consumer 也立即输出了新增的两条数据。 输出数据 InfluxDB line protocol 的格式。
-```
+```shell
-kafka-console-consumer --bootstrap-server localhost:9092 --from-beginning --topic tdengine-source-test
+kafka-console-consumer.sh --bootstrap-server localhost:9092 --from-beginning --topic tdengine-source-test-meters
 ```
 输出：
-```
+```txt
 ......
 meters,location="California.SanFrancisco",groupid=2i32 current=10.3f32,voltage=219i32,phase=0.31f32 1538548685000000000
 meters,location="California.SanFrancisco",groupid=2i32 current=12.6f32,voltage=218i32,phase=0.33f32 1538548695000000000
@ -373,7 +297,7 @@ meters,location="California.SanFrancisco",groupid=2i32 current=12.6f32,voltage=2
 此时会显示所有历史数据。切换到 TDengine CLI， 插入两条新的数据：
-```
+```sql
 USE test;
 INSERT INTO d1001 VALUES (now, 13.3, 229, 0.38);
 INSERT INTO d1002 VALUES (now, 16.3, 233, 0.22);
@ -387,15 +311,15 @@ INSERT INTO d1002 VALUES (now, 16.3, 233, 0.22);
 查看当前活跃的 connector：
-```
+```shell
-confluent local services connect connector status
+curl http://localhost:8083/connectors
 ```
 如果按照前述操作，此时应有两个活跃的 connector。使用下面的命令 unload：
-```
+```shell
-confluent local services connect connector unload TDengineSinkConnector
+curl -X DELETE http://localhost:8083/connectors/TDengineSinkConnector
-confluent local services connect connector unload TDengineSourceConnector
+curl -X DELETE http://localhost:8083/connectors/TDengineSourceConnector
 ```
 ## 配置参考
@ -442,15 +366,12 @@ confluent local services connect connector unload TDengineSourceConnector
 ## 其他说明
-1. 插件的安装位置可以自定义，请参考官方文档：https://docs.confluent.io/home/connect/self-managed/install.html#install-connector-manually。
+1. 关于如何在独立安装的 Kafka 环境使用 Kafka Connect 插件， 请参考官方文档：<https://kafka.apache.org/documentation/#connect>。
 2. 本教程的示例程序使用了 Confluent 平台，但是 TDengine Kafka Connector 本身同样适用于独立安装的 Kafka, 且配置方法相同。关于如何在独立安装的 Kafka 环境使用 Kafka Connect 插件， 请参考官方文档： https://kafka.apache.org/documentation/#connect。
 ## 问题反馈
-无论遇到任何问题，都欢迎在本项目的 Github 仓库反馈： https://github.com/taosdata/kafka-connect-tdengine/issues。
+无论遇到任何问题，都欢迎在本项目的 Github 仓库反馈：<https://github.com/taosdata/kafka-connect-tdengine/issues>。
 ## 参考
-1. https://www.confluent.io/what-is-apache-kafka
+1. <https://kafka.apache.org/documentation/>
 2. https://developer.confluent.io/learn-kafka/kafka-connect/intro
 3. https://docs.confluent.io/platform/current/platform.html
--- a/docs/zh/28-releases/01-tdengine.md
+++ b/docs/zh/28-releases/01-tdengine.md
@ -10,6 +10,10 @@ TDengine 2.x 各版本安装包请访问[这里](https://www.taosdata.com/all-do
 import Release from "/components/ReleaseV3";
 ## 3.0.5.0
 <Release type="tdengine" version="3.0.5.0" />
 ## 3.0.4.2
 <Release type="tdengine" version="3.0.4.2" />
--- a/docs/zh/28-releases/02-tools.md
+++ b/docs/zh/28-releases/02-tools.md
@ -10,6 +10,10 @@ taosTools 各版本安装包下载链接如下：
 import Release from "/components/ReleaseV3";
 ## 2.5.1
 <Release type="tools" version="2.5.1" />
 ## 2.5.0
 <Release type="tools" version="2.5.0" />
--- a/examples/JDBC/consumer-demo/pom.xml
+++ b/examples/JDBC/consumer-demo/pom.xml
@ -0,0 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.taosdata</groupId>
    <artifactId>consumer</artifactId>
    <version>1.0-SNAPSHOT</version>
    <properties>
        <maven.compiler.source>8</maven.compiler.source>
        <maven.compiler.target>8</maven.compiler.target>
    </properties>
    <dependencies>
        <dependency>
            <groupId>com.taosdata.jdbc</groupId>
            <artifactId>taos-jdbcdriver</artifactId>
            <version>3.2.1</version>
        </dependency>
        <dependency>
            <groupId>com.google.guava</groupId>
            <artifactId>guava</artifactId>
            <version>30.1.1-jre</version>
        </dependency>
    </dependencies>
    <build>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-assembly-plugin</artifactId>
                <version>3.3.0</version>
                <executions>
                    <execution>
                        <id>ConsumerDemo</id>
                        <configuration>
                            <finalName>ConsumerDemo</finalName>
                            <archive>
                                <manifest>
                                    <mainClass>com.taosdata.ConsumerDemo</mainClass>
                                </manifest>
                            </archive>
                            <descriptorRefs>
                                <descriptorRef>jar-with-dependencies</descriptorRef>
                            </descriptorRefs>
                        </configuration>
                        <phase>package</phase>
                        <goals>
                            <goal>single</goal>
                        </goals>
                    </execution>
                </executions>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
                <configuration>
                    <source>8</source>
                    <target>8</target>
                    <encoding>UTF-8</encoding>
                </configuration>
            </plugin>
        </plugins>
    </build>
 </project>
--- a/examples/JDBC/consumer-demo/readme.md
+++ b/examples/JDBC/consumer-demo/readme.md
@ -0,0 +1,52 @@
 # How to Run the Consumer Demo Code On Linux OS
 TDengine's Consumer demo project is organized in a Maven way so that users can easily compile, package and run the project. If you don't have Maven on your server, you may install it using
 ```
 sudo apt-get install maven
 ```
 ## Install TDengine Client and TaosAdapter
 Make sure you have already installed a tdengine client on your current develop environment.
 Download the tdengine package on our website: ``https://www.taosdata.com/cn/all-downloads/`` and install the client.
 ## Run Consumer Demo using mvn plugin
 run command:
 ```
 mvn clean compile exec:java -Dexec.mainClass="com.taosdata.ConsumerDemo"
 ```
 ## Custom configuration
 ```shell
 # the host of TDengine server
 export TAOS_HOST="127.0.0.1"
 # the port of TDengine server
 export TAOS_PORT="6041"
 # the consumer type, can be "ws" or "jni"
 export TAOS_TYPE="ws"
 # the number of consumers
 export TAOS_JDBC_CONSUMER_NUM="1"
 # the number of processors to consume
 export TAOS_JDBC_PROCESSOR_NUM="2"
 # the number of records to be consumed per processor per second
 export TAOS_JDBC_RATE_PER_PROCESSOR="1000"
 # poll wait time in ms
 export TAOS_JDBC_POLL_SLEEP="100"
 ```
 ## Run Consumer Demo using jar
 To compile the demo project, go to the source directory ``TDengine/tests/examples/JDBC/consumer-demo`` and execute
 ```
 mvn clean package assembly:single
 ```
 To run ConsumerDemo.jar, go to ``TDengine/tests/examples/JDBC/consumer-demo`` and execute
 ```
 java -jar target/ConsumerDemo-jar-with-dependencies.jar
 ```
--- a/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Bean.java
+++ b/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Bean.java
@ -0,0 +1,43 @@
 package com.taosdata;
 import java.sql.Timestamp;
 public class Bean {
    private Timestamp ts;
    private Integer c1;
    private String c2;
    public Timestamp getTs() {
        return ts;
    }
    public void setTs(Timestamp ts) {
        this.ts = ts;
    }
    public Integer getC1() {
        return c1;
    }
    public void setC1(Integer c1) {
        this.c1 = c1;
    }
    public String getC2() {
        return c2;
    }
    public void setC2(String c2) {
        this.c2 = c2;
    }
    @Override
    public String toString() {
        final StringBuilder sb = new StringBuilder("Bean {");
        sb.append("ts=").append(ts);
        sb.append(", c1=").append(c1);
        sb.append(", c2='").append(c2).append('\'');
        sb.append('}');
        return sb.toString();
    }
 }
--- a/examples/JDBC/consumer-demo/src/main/java/com/taosdata/BeanDeserializer.java
+++ b/examples/JDBC/consumer-demo/src/main/java/com/taosdata/BeanDeserializer.java
@ -0,0 +1,6 @@
 package com.taosdata;
 import com.taosdata.jdbc.tmq.ReferenceDeserializer;
 public class BeanDeserializer extends ReferenceDeserializer<Bean> {
 }
--- a/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Config.java
+++ b/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Config.java
@ -0,0 +1,78 @@
 package com.taosdata;
 public class Config {
    public static final String TOPIC = "test_consumer";
    public static final String TAOS_HOST = "127.0.0.1";
    public static final String TAOS_PORT = "6041";
    public static final String TAOS_TYPE = "ws";
    public static final int TAOS_JDBC_CONSUMER_NUM = 1;
    public static final int TAOS_JDBC_PROCESSOR_NUM = 2;
    public static final int TAOS_JDBC_RATE_PER_PROCESSOR = 1000;
    public static final int TAOS_JDBC_POLL_SLEEP = 100;
    private final int consumerNum;
    private final int processCapacity;
    private final int rate;
    private final int pollSleep;
    private final String type;
    private final String host;
    private final String port;
    public Config(String type, String host, String port, int consumerNum, int processCapacity, int rate, int pollSleep) {
        this.type = type;
        this.consumerNum = consumerNum;
        this.processCapacity = processCapacity;
        this.rate = rate;
        this.pollSleep = pollSleep;
        this.host = host;
        this.port = port;
    }
    public int getConsumerNum() {
        return consumerNum;
    }
    public int getProcessCapacity() {
        return processCapacity;
    }
    public int getRate() {
        return rate;
    }
    public int getPollSleep() {
        return pollSleep;
    }
    public String getHost() {
        return host;
    }
    public String getPort() {
        return port;
    }
    public String getType() {
        return type;
    }
    public static Config getFromENV() {
        String host = System.getenv("TAOS_HOST") != null ? System.getenv("TAOS_HOST") : TAOS_HOST;
        String port = System.getenv("TAOS_PORT") != null ? System.getenv("TAOS_PORT") : TAOS_PORT;
        String type = System.getenv("TAOS_TYPE") != null ? System.getenv("TAOS_TYPE") : TAOS_TYPE;
        String c = System.getenv("TAOS_JDBC_CONSUMER_NUM");
        int num = c != null ? Integer.parseInt(c) : TAOS_JDBC_CONSUMER_NUM;
        String p = System.getenv("TAOS_JDBC_PROCESSOR_NUM");
        int capacity = p != null ? Integer.parseInt(p) : TAOS_JDBC_PROCESSOR_NUM;
        String r = System.getenv("TAOS_JDBC_RATE_PER_PROCESSOR");
        int rate = r != null ? Integer.parseInt(r) : TAOS_JDBC_RATE_PER_PROCESSOR;
        String s = System.getenv("TAOS_JDBC_POLL_SLEEP");
        int sleep = s != null ? Integer.parseInt(s) : TAOS_JDBC_POLL_SLEEP;
        return new Config(type, host, port, num, capacity, rate, sleep);
    }
 }
--- a/examples/JDBC/consumer-demo/src/main/java/com/taosdata/ConsumerDemo.java
+++ b/examples/JDBC/consumer-demo/src/main/java/com/taosdata/ConsumerDemo.java
@ -0,0 +1,65 @@
 package com.taosdata;
 import com.taosdata.jdbc.tmq.TMQConstants;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import static com.taosdata.Config.*;
 public class ConsumerDemo {
    public static void main(String[] args) throws SQLException {
        // Config
        Config config = Config.getFromENV();
        // Generated data
        mockData();
        Properties prop = new Properties();
        prop.setProperty(TMQConstants.CONNECT_TYPE, config.getType());
        prop.setProperty(TMQConstants.BOOTSTRAP_SERVERS, config.getHost() + ":" + config.getPort());
        prop.setProperty(TMQConstants.CONNECT_USER, "root");
        prop.setProperty(TMQConstants.CONNECT_PASS, "taosdata");
        prop.setProperty(TMQConstants.MSG_WITH_TABLE_NAME, "true");
        prop.setProperty(TMQConstants.ENABLE_AUTO_COMMIT, "true");
        prop.setProperty(TMQConstants.GROUP_ID, "gId");
        prop.setProperty(TMQConstants.VALUE_DESERIALIZER, "com.taosdata.BeanDeserializer");
        for (int i = 0; i < config.getConsumerNum() - 1; i++) {
            new Thread(new Worker(prop, config)).start();
        }
        new Worker(prop, config).run();
    }
    public static void mockData() throws SQLException {
        String dbName = "test_consumer";
        String tableName = "st";
        String url = "jdbc:TAOS-RS://" + TAOS_HOST + ":" + TAOS_PORT + "/?user=root&password=taosdata&batchfetch=true";
        Connection connection = DriverManager.getConnection(url);
        Statement statement = connection.createStatement();
        statement.executeUpdate("create database if not exists " + dbName + " WAL_RETENTION_PERIOD 3650");
        statement.executeUpdate("use " + dbName);
        statement.executeUpdate("create table if not exists " + tableName + " (ts timestamp, c1 int, c2 nchar(100)) ");
        statement.executeUpdate("create topic if not exists " + TOPIC + " as select ts, c1, c2 from " + tableName);
        ScheduledExecutorService scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(r -> {
            Thread t = new Thread(r);
            t.setName("mock-data-thread-" + t.getId());
            return t;
        });
        AtomicInteger atomic = new AtomicInteger();
        scheduledExecutorService.scheduleWithFixedDelay(() -> {
            int i = atomic.getAndIncrement();
            try {
                statement.executeUpdate("insert into " + tableName + " values(now, " + i + ",'" + i + "')");
            } catch (SQLException e) {
                // ignore
            }
        }, 0, 10, TimeUnit.MILLISECONDS);
    }
 }
--- a/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Worker.java
+++ b/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Worker.java
@ -0,0 +1,60 @@
 package com.taosdata;
 import com.google.common.util.concurrent.RateLimiter;
 import com.taosdata.jdbc.tmq.ConsumerRecord;
 import com.taosdata.jdbc.tmq.ConsumerRecords;
 import com.taosdata.jdbc.tmq.TaosConsumer;
 import java.sql.SQLException;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.Collections;
 import java.util.Properties;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.Semaphore;
 public class Worker implements Runnable {
    int sleepTime;
    int rate;
    ForkJoinPool pool = new ForkJoinPool();
    Semaphore semaphore;
    TaosConsumer<Bean> consumer;
    public Worker(Properties prop, Config config) throws SQLException {
        consumer = new TaosConsumer<>(prop);
        consumer.subscribe(Collections.singletonList(Config.TOPIC));
        semaphore = new Semaphore(config.getProcessCapacity());
        sleepTime = config.getPollSleep();
        rate = config.getRate();
    }
    @Override
    public void run() {
        while (!Thread.interrupted()) {
            try {
                // 控制请求频率
                if (semaphore.tryAcquire()) {
                    ConsumerRecords<Bean> records = consumer.poll(Duration.ofMillis(sleepTime));
                    pool.submit(() -> {
                        RateLimiter limiter = RateLimiter.create(rate);
                        try {
                            for (ConsumerRecord<Bean> record : records) {
                                // 流量控制
                                limiter.acquire();
                                // 业务处理数据
                                System.out.println("[" + LocalDateTime.now() + "] Thread id:" + Thread.currentThread().getId() + " -> " + record.value());
                            }
                        } finally {
                            semaphore.release();
                        }
                    });
                }
            } catch (SQLException e) {
                e.printStackTrace();
            }
        }
    }
 }
--- a/examples/JDBC/springbootdemo/src/main/resources/application.properties
+++ b/examples/JDBC/springbootdemo/src/main/resources/application.properties
@ -5,7 +5,7 @@
 #spring.datasource.password=taosdata
 # datasource config - JDBC-RESTful
 spring.datasource.driver-class-name=com.taosdata.jdbc.rs.RestfulDriver
-spring.datasource.url=jdbc:TAOS-RS://localhost:6041/test?timezone=UTC-8&charset=UTF-8&locale=en_US.UTF-8
+spring.datasource.url=jdbc:TAOS-RS://localhost:6041/test
 spring.datasource.username=root
 spring.datasource.password=taosdata
 spring.datasource.druid.initial-size=5
--- a/examples/c/CMakeLists.txt
+++ b/examples/c/CMakeLists.txt
@ -42,27 +42,27 @@ IF (TD_LINUX)
    )
  target_link_libraries(tmq
-      taos_static
+      taos
      )
  target_link_libraries(stream_demo
-      taos_static
+      taos
      )
  target_link_libraries(schemaless
-      taos_static
+      taos
      )
  target_link_libraries(prepare
-      taos_static
+      taos
      )
  target_link_libraries(demo
-      taos_static
+      taos
      )
  target_link_libraries(asyncdemo
-      taos_static
+      taos
      )
  SET_TARGET_PROPERTIES(tmq PROPERTIES OUTPUT_NAME tmq)
--- a/include/common/tdatablock.h
+++ b/include/common/tdatablock.h
@ -248,6 +248,7 @@ int32_t buildSubmitReqFromDataBlock(SSubmitReq2** pReq, const SSDataBlock* pData
                                    tb_uid_t suid);
 char* buildCtbNameByGroupId(const char* stbName, uint64_t groupId);
 int32_t buildCtbNameByGroupIdImpl(const char* stbName, uint64_t groupId, char* pBuf);
 static FORCE_INLINE int32_t blockGetEncodeSize(const SSDataBlock* pBlock) {
  return blockDataGetSerialMetaSize(taosArrayGetSize(pBlock->pDataBlock)) + blockDataGetSize(pBlock);
--- a/include/libs/function/function.h
+++ b/include/libs/function/function.h
@ -163,6 +163,7 @@ typedef struct {
  int64_t                  checkPointId;
  int32_t                  taskId;
  int64_t                  streamId;
  int64_t                  streamBackendRid;
 } SStreamState;
 typedef struct SFunctionStateStore {
--- a/include/libs/stream/tstream.h
+++ b/include/libs/stream/tstream.h
@ -327,6 +327,7 @@ struct SStreamTask {
  int64_t             checkpointingId;
  int32_t             checkpointAlignCnt;
  struct SStreamMeta* pMeta;
  SSHashObj*          pNameMap;
 };
 // meta
@ -344,7 +345,6 @@ typedef struct SStreamMeta {
  SRWLatch     lock;
  int32_t      walScanCounter;
  void*        streamBackend;
  int32_t      streamBackendId;
  int64_t      streamBackendRid;
  SHashObj*    pTaskBackendUnique;
 } SStreamMeta;
--- a/include/os/osMemory.h
+++ b/include/os/osMemory.h
@ -22,21 +22,20 @@ extern "C" {
 // If the error is in a third-party library, place this header file under the third-party library header file.
 // When you want to use this feature, you should find or add the same function in the following sectio
-// #if !defined(WINDOWS)
+#if !defined(WINDOWS)
-// #ifndef ALLOW_FORBID_FUNC
+#ifndef ALLOW_FORBID_FUNC
-// #define malloc  MALLOC_FUNC_TAOS_FORBID
+#define malloc  MALLOC_FUNC_TAOS_FORBID
-// #define calloc  CALLOC_FUNC_TAOS_FORBID
+#define calloc  CALLOC_FUNC_TAOS_FORBID
-// #define realloc REALLOC_FUNC_TAOS_FORBID
+#define realloc REALLOC_FUNC_TAOS_FORBID
-// #define free    FREE_FUNC_TAOS_FORBID
+#define free    FREE_FUNC_TAOS_FORBID
-// #ifdef strdup
+#ifdef strdup
-// #undef strdup
+#undef strdup
-// #define strdup STRDUP_FUNC_TAOS_FORBID
+#define strdup STRDUP_FUNC_TAOS_FORBID
-// #endif
+#endif
-// #endif  // ifndef ALLOW_FORBID_FUNC
+#endif  // ifndef ALLOW_FORBID_FUNC
-// #endif  // if !defined(WINDOWS)
+#endif  // if !defined(WINDOWS)
 // // #define taosMemoryFree    malloc
 // #define taosMemoryMalloc  malloc
 // #define taosMemoryCalloc  calloc
 // #define taosMemoryRealloc realloc
--- a/packaging/deb/DEBIAN/preinst
+++ b/packaging/deb/DEBIAN/preinst
@ -80,5 +80,4 @@ fi
 # there can not libtaos.so*, otherwise ln -s  error
 ${csudo}rm -f ${install_main_dir}/driver/libtaos.*   || :
 [ -f ${install_main_dir}/driver/librocksdb.* ] && ${csudo}rm -f ${install_main_dir}/driver/librocksdb.*  || :
 [ -f ${install_main_dir}/driver/libtaosws.so ] && ${csudo}rm -f ${install_main_dir}/driver/libtaosws.so   || :
--- a/packaging/deb/DEBIAN/prerm
+++ b/packaging/deb/DEBIAN/prerm
@ -40,7 +40,6 @@ else
    ${csudo}rm -f ${inc_link_dir}/taosudf.h     || :
    [ -f ${inc_link_dir}/taosws.h ] && ${csudo}rm -f ${inc_link_dir}/taosws.h     || :
    ${csudo}rm -f ${lib_link_dir}/libtaos.*  || :
    [ -f ${lib_link_dir}/librocksdb.* ] && ${csudo}rm -f ${lib_link_dir}/librocksdb.*  || :
    [ -f ${lib_link_dir}/libtaosws.so ] && ${csudo}rm -f ${lib_link_dir}/libtaosws.so  || :
    ${csudo}rm -f ${log_link_dir}            || :
--- a/packaging/deb/makedeb.sh
+++ b/packaging/deb/makedeb.sh
@ -31,7 +31,6 @@ cd ${pkg_dir}
 libfile="libtaos.so.${tdengine_ver}"
 wslibfile="libtaosws.so"
 rocksdblib="librocksdb.so.8"
 # create install dir
 install_home_path="/usr/local/taos"
@ -95,7 +94,6 @@ fi
 cp ${compile_dir}/build/bin/taos                    ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/build/lib/${libfile}              ${pkg_dir}${install_home_path}/driver
 [ -f ${compile_dir}/build/lib/${rocksdblib} ] && cp ${compile_dir}/build/lib/${rocksdblib}            ${pkg_dir}${install_home_path}/driver ||:
 [ -f ${compile_dir}/build/lib/${wslibfile} ] && cp ${compile_dir}/build/lib/${wslibfile}            ${pkg_dir}${install_home_path}/driver ||:
 cp ${compile_dir}/../include/client/taos.h          ${pkg_dir}${install_home_path}/include
 cp ${compile_dir}/../include/common/taosdef.h       ${pkg_dir}${install_home_path}/include
--- a/packaging/rpm/tdengine.spec
+++ b/packaging/rpm/tdengine.spec
@ -45,7 +45,6 @@ echo buildroot: %{buildroot}
 libfile="libtaos.so.%{_version}"
 wslibfile="libtaosws.so"
 rocksdblib="librocksdb.so.8"
 # create install path, and cp file
 mkdir -p %{buildroot}%{homepath}/bin
@ -93,7 +92,6 @@ if [ -f %{_compiledir}/build/bin/taosadapter ]; then
 fi
 cp %{_compiledir}/build/lib/${libfile}              %{buildroot}%{homepath}/driver
 [ -f %{_compiledir}/build/lib/${wslibfile} ] && cp %{_compiledir}/build/lib/${wslibfile}            %{buildroot}%{homepath}/driver ||:
 [ -f %{_compiledir}/build/lib/${rocksdblib} ] && cp %{_compiledir}/build/lib/${rocksdblib}            %{buildroot}%{homepath}/driver ||:
 cp %{_compiledir}/../include/client/taos.h          %{buildroot}%{homepath}/include
 cp %{_compiledir}/../include/common/taosdef.h       %{buildroot}%{homepath}/include
 cp %{_compiledir}/../include/util/taoserror.h       %{buildroot}%{homepath}/include
@ -176,7 +174,6 @@ fi
 # there can not libtaos.so*, otherwise ln -s  error
 ${csudo}rm -f %{homepath}/driver/libtaos*   || :
 ${csudo}rm -f %{homepath}/driver/librocksdb*   || :
 #Scripts executed after installation
 %post
@ -222,7 +219,6 @@ if [ $1 -eq 0 ];then
    ${csudo}rm -f ${inc_link_dir}/taoserror.h     || :
    ${csudo}rm -f ${inc_link_dir}/taosudf.h     || :    
    ${csudo}rm -f ${lib_link_dir}/libtaos.*  || :
    ${csudo}rm -f ${lib_link_dir}/librocksdb.*  || :
    ${csudo}rm -f ${log_link_dir}            || :
    ${csudo}rm -f ${data_link_dir}           || :
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
@ -250,30 +250,18 @@ function install_lib() {
  # Remove links
  ${csudo}rm -f ${lib_link_dir}/libtaos.* || :
  ${csudo}rm -f ${lib64_link_dir}/libtaos.* || :
  ${csudo}rm -f ${lib_link_dir}/librocksdb.* || :
  ${csudo}rm -f ${lib64_link_dir}/librocksdb.* || :
  #${csudo}rm -rf ${v15_java_app_dir}              || :
  ${csudo}cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo}chmod 777 ${install_main_dir}/driver/*
  ${csudo}ln -sf ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
  ${csudo}ln -sf ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
  ${csudo}ln -sf ${install_main_dir}/driver/librocksdb.* ${lib_link_dir}/librocksdb.so.8
  ${csudo}ln -sf ${lib_link_dir}/librocksdb.so.8 ${lib_link_dir}/librocksdb.so
  ${csudo}ln -sf ${install_main_dir}/driver/librocksdb.* ${lib_link_dir}/librocksdb.so.8
  ${csudo}ln -sf ${lib_link_dir}/librocksdb.so.8 ${lib_link_dir}/librocksdb.so
  [ -f ${install_main_dir}/driver/libtaosws.so ] && ${csudo}ln -sf ${install_main_dir}/driver/libtaosws.so ${lib_link_dir}/libtaosws.so || :
  if [[ -d ${lib64_link_dir} && ! -e ${lib64_link_dir}/libtaos.so ]]; then
    ${csudo}ln -sf ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1 || :
    ${csudo}ln -sf ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so || :
    ${csudo}ln -sf ${install_main_dir}/driver/librocksdb.* ${lib64_link_dir}/librocksdb.so.8 || :
    ${csudo}ln -sf ${lib64_link_dir}/librocksdb.so.8 ${lib64_link_dir}/librocksdb.so || :
    [ -f ${install_main_dir}/libtaosws.so ] && ${csudo}ln -sf ${install_main_dir}/libtaosws.so ${lib64_link_dir}/libtaosws.so || :
  fi
--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
@ -111,11 +111,9 @@ fi
 if [ "$osType" == "Darwin" ]; then
    lib_files="${build_dir}/lib/libtaos.${version}.dylib"
    wslib_files="${build_dir}/lib/libtaosws.dylib"
    rocksdb_lib_files="${build_dir}/lib/librocksdb.dylib.8.1.1"
 else
    lib_files="${build_dir}/lib/libtaos.so.${version}"
    wslib_files="${build_dir}/lib/libtaosws.so"
    rocksdb_lib_files="${build_dir}/lib/librocksdb.so.8.1.1"
 fi
 header_files="${code_dir}/include/client/taos.h ${code_dir}/include/common/taosdef.h ${code_dir}/include/util/taoserror.h ${code_dir}/include/libs/function/taosudf.h"
@ -338,7 +336,6 @@ fi
 # Copy driver
 mkdir -p ${install_dir}/driver && cp ${lib_files} ${install_dir}/driver && echo "${versionComp}" >${install_dir}/driver/vercomp.txt
 [ -f ${wslib_files} ] && cp ${wslib_files} ${install_dir}/driver || :
 [ -f ${rocksdb_lib_files} ] && cp ${rocksdb_lib_files} ${install_dir}/driver || :
 # Copy connector
 if [ "$verMode" == "cluster" ]; then
--- a/packaging/tools/post.sh
+++ b/packaging/tools/post.sh
@ -203,18 +203,9 @@ function install_lib() {
    ${csudo}rm -f ${lib_link_dir}/libtaos* || :
    ${csudo}rm -f ${lib64_link_dir}/libtaos* || :
    #rocksdb
    [ -f ${lib_link_dir}/librocksdb* ] && ${csudo}rm -f ${lib_link_dir}/librocksdb* || :
    [ -f ${lib64_link_dir}/librocksdb* ] && ${csudo}rm -f ${lib64_link_dir}/librocksdb* || :
    #rocksdb
    [ -f ${lib_link_dir}/librocksdb* ] && ${csudo}rm -f ${lib_link_dir}/librocksdb* || :
    [ -f ${lib64_link_dir}/librocksdb* ] && ${csudo}rm -f ${lib64_link_dir}/librocksdb* || :
    [ -f ${lib_link_dir}/libtaosws.${lib_file_ext} ] && ${csudo}rm -f ${lib_link_dir}/libtaosws.${lib_file_ext} || :
    [ -f ${lib64_link_dir}/libtaosws.${lib_file_ext} ] && ${csudo}rm -f ${lib64_link_dir}/libtaosws.${lib_file_ext} || :
    ${csudo}ln -s ${lib_dir}/librocksdb.* ${lib_link_dir}/librocksdb.${lib_file_ext_1} 2>>${install_log_path} || return 1
    ${csudo}ln -s ${lib_dir}/libtaos.* ${lib_link_dir}/libtaos.${lib_file_ext_1} 2>>${install_log_path} || return 1
    ${csudo}ln -s ${lib_link_dir}/libtaos.${lib_file_ext_1} ${lib_link_dir}/libtaos.${lib_file_ext} 2>>${install_log_path} || return 1
@ -223,7 +214,6 @@ function install_lib() {
    if [[ -d ${lib64_link_dir} && ! -e ${lib64_link_dir}/libtaos.${lib_file_ext} ]]; then
      ${csudo}ln -s ${lib_dir}/libtaos.* ${lib64_link_dir}/libtaos.${lib_file_ext_1} 2>>${install_log_path} || return 1
      ${csudo}ln -s ${lib64_link_dir}/libtaos.${lib_file_ext_1} ${lib64_link_dir}/libtaos.${lib_file_ext}  2>>${install_log_path} || return 1
      ${csudo}ln -s ${lib_dir}/librocksdb.* ${lib64_link_dir}/librocksdb.${lib_file_ext_1} 2>>${install_log_path} || return 1
      [ -f ${lib_dir}/libtaosws.${lib_file_ext} ] && ${csudo}ln -sf ${lib_dir}/libtaosws.${lib_file_ext} ${lib64_link_dir}/libtaosws.${lib_file_ext} 2>>${install_log_path}
    fi
--- a/packaging/tools/remove.sh
+++ b/packaging/tools/remove.sh
@ -142,11 +142,9 @@ function clean_local_bin() {
 function clean_lib() {
  # Remove link
  ${csudo}rm -f ${lib_link_dir}/libtaos.* || :
  ${csudo}rm -f ${lib_link_dir}/librocksdb.* || :
  [ -f ${lib_link_dir}/libtaosws.* ] && ${csudo}rm -f ${lib_link_dir}/libtaosws.* || :
  ${csudo}rm -f ${lib64_link_dir}/libtaos.* || :
  ${csudo}rm -f ${lib64_link_dir}/librocksdb.* || :
  [ -f ${lib64_link_dir}/libtaosws.* ] && ${csudo}rm -f ${lib64_link_dir}/libtaosws.* || :
  #${csudo}rm -rf ${v15_java_app_dir}           || :
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@ -2465,19 +2465,31 @@ _end:
 }
 char* buildCtbNameByGroupId(const char* stbFullName, uint64_t groupId) {
-  if (stbFullName[0] == 0) {
+  char* pBuf = taosMemoryCalloc(1, TSDB_TABLE_NAME_LEN + 1);
  if (!pBuf) {
    return NULL;
  }
  int32_t code = buildCtbNameByGroupIdImpl(stbFullName, groupId, pBuf);
  if (code != TSDB_CODE_SUCCESS) {
    taosMemoryFree(pBuf);
    return NULL;
  }
  return pBuf;
 }
 int32_t buildCtbNameByGroupIdImpl(const char* stbFullName, uint64_t groupId, char* cname) {
  if (stbFullName[0] == 0) {
    return TSDB_CODE_FAILED;
  }
  SArray* tags = taosArrayInit(0, sizeof(SSmlKv));
  if (tags == NULL) {
-    return NULL;
+    return TSDB_CODE_FAILED;
  }
  void* cname = taosMemoryCalloc(1, TSDB_TABLE_NAME_LEN + 1);
  if (cname == NULL) {
    taosArrayDestroy(tags);
-    return NULL;
+    return TSDB_CODE_FAILED;
  }
  SSmlKv pTag = {.key = "group_id",
@ -2499,9 +2511,9 @@ char* buildCtbNameByGroupId(const char* stbFullName, uint64_t groupId) {
  taosArrayDestroy(tags);
  if ((rname.ctbShortName && rname.ctbShortName[0]) == 0) {
-    return NULL;
+    return TSDB_CODE_FAILED;
  }
-  return rname.ctbShortName;
+  return TSDB_CODE_SUCCESS;
 }
 int32_t blockEncode(const SSDataBlock* pBlock, char* data, int32_t numOfCols) {
--- a/source/dnode/vnode/CMakeLists.txt
+++ b/source/dnode/vnode/CMakeLists.txt
@ -103,7 +103,7 @@ target_link_libraries(
    # PUBLIC bdb
    # PUBLIC scalar
-    PUBLIC rocksdb-shared
+    PUBLIC rocksdb
    PUBLIC transport
    PUBLIC stream
    PUBLIC index
--- a/source/dnode/vnode/src/tq/tqSink.c
+++ b/source/dnode/vnode/src/tq/tqSink.c
@ -298,10 +298,8 @@ void tqSinkToTablePipeline(SStreamTask* pTask, void* vnode, int64_t ver, void* d
        if (res == TSDB_CODE_SUCCESS) {
          memcpy(ctbName, pTableSinkInfo->tbName, strlen(pTableSinkInfo->tbName));
        } else {
-          char* tmp = buildCtbNameByGroupId(stbFullName, pDataBlock->info.id.groupId);
+          buildCtbNameByGroupIdImpl(stbFullName, pDataBlock->info.id.groupId, ctbName);
-          memcpy(ctbName, tmp, strlen(tmp));
+          memcpy(pTableSinkInfo->tbName, ctbName, strlen(ctbName));
          memcpy(pTableSinkInfo->tbName, tmp, strlen(tmp));
          taosMemoryFree(tmp);
          tqDebug("vgId:%d, gropuId:%" PRIu64 " datablock table name is null", TD_VID(pVnode),
                  pDataBlock->info.id.groupId);
        }
--- a/source/libs/executor/inc/executorInt.h
+++ b/source/libs/executor/inc/executorInt.h
@ -457,6 +457,7 @@ typedef struct SStreamIntervalOperatorInfo {
  int64_t            dataVersion;
  SStateStore        statestore;
  bool               recvGetAll;
  SHashObj*          pFinalPullDataMap;
 } SStreamIntervalOperatorInfo;
 typedef struct SDataGroupInfo {
--- a/source/libs/executor/src/groupoperator.c
+++ b/source/libs/executor/src/groupoperator.c
@ -647,6 +647,8 @@ uint64_t calcGroupId(char* pData, int32_t len) {
  // NOTE: only extract the initial 8 bytes of the final MD5 digest
  uint64_t id = 0;
  memcpy(&id, context.digest, sizeof(uint64_t));
  if (0 == id)
    memcpy(&id, context.digest + 8, sizeof(uint64_t));
  return id;
 }
--- a/source/libs/executor/src/joinoperator.c
+++ b/source/libs/executor/src/joinoperator.c
@ -319,6 +319,11 @@ void destroyMergeJoinOperator(void* param) {
  }
  nodesDestroyNode(pJoinOperator->pCondAfterMerge);
  taosArrayDestroy(pJoinOperator->rowCtx.leftCreatedBlocks);
  taosArrayDestroy(pJoinOperator->rowCtx.rightCreatedBlocks);
  taosArrayDestroy(pJoinOperator->rowCtx.leftRowLocations);
  taosArrayDestroy(pJoinOperator->rowCtx.rightRowLocations);
  pJoinOperator->pRes = blockDataDestroy(pJoinOperator->pRes);
  taosMemoryFreeClear(param);
 }
--- a/source/libs/executor/src/projectoperator.c
+++ b/source/libs/executor/src/projectoperator.c
@ -213,6 +213,8 @@ static int32_t doIngroupLimitOffset(SLimitInfo* pLimitInfo, uint64_t groupId, SS
  } else {
    if (limitReached && (pLimitInfo->slimit.limit >= 0 && pLimitInfo->slimit.limit <= pLimitInfo->numOfOutputGroups)) {
      setOperatorCompleted(pOperator);
    } else if (limitReached && groupId == 0) {
      setOperatorCompleted(pOperator);
    }
  }
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@ -1865,7 +1865,7 @@ static SSDataBlock* doStreamScan(SOperatorInfo* pOperator) {
          TSKEY maxTs = pAPI->stateStore.updateInfoFillBlockData(pInfo->pUpdateInfo, pInfo->pRecoverRes, pInfo->primaryTsIndex);
          pInfo->twAggSup.maxTs = TMAX(pInfo->twAggSup.maxTs, maxTs);
        } else {
-          pInfo->pUpdateInfo->maxDataVersion = pTaskInfo->streamInfo.fillHistoryVer2;
+          pInfo->pUpdateInfo->maxDataVersion = TMAX(pInfo->pUpdateInfo->maxDataVersion, pTaskInfo->streamInfo.fillHistoryVer2);
          doCheckUpdate(pInfo, pInfo->pRecoverRes->info.window.ekey, pInfo->pRecoverRes);
        }
      }
--- a/source/libs/executor/src/timesliceoperator.c
+++ b/source/libs/executor/src/timesliceoperator.c
@ -257,6 +257,7 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
  // output the result
  int32_t fillColIndex = 0;
  bool       hasInterp = true;
  for (int32_t j = 0; j < pExprSup->numOfExprs; ++j) {
    SExprInfo* pExprInfo = &pExprSup->pExprInfo[j];
@ -307,7 +308,7 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
      case TSDB_FILL_SET_VALUE:
      case TSDB_FILL_SET_VALUE_F: {
-        SVariant* pVar = &pSliceInfo->pFillColInfo[j].fillVal;
+        SVariant* pVar = &pSliceInfo->pFillColInfo[fillColIndex].fillVal;
        if (pDst->info.type == TSDB_DATA_TYPE_FLOAT) {
          float v = 0;
@ -342,6 +343,8 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
          }
          colDataSetVal(pDst, rows, (char*)&v, false);
        }
        ++fillColIndex;
        break;
      }
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@ -1306,6 +1306,8 @@ static bool doDeleteWindow(SOperatorInfo* pOperator, TSKEY ts, uint64_t groupId)
  return true;
 }
 static int32_t getChildIndex(SSDataBlock* pBlock) { return pBlock->info.childId; }
 static void doDeleteWindows(SOperatorInfo* pOperator, SInterval* pInterval, SSDataBlock* pBlock, SArray* pUpWins,
                            SSHashObj* pUpdatedMap) {
  SStreamIntervalOperatorInfo* pInfo = pOperator->info;
@ -1340,9 +1342,15 @@ static void doDeleteWindows(SOperatorInfo* pOperator, SInterval* pInterval, SSDa
      SWinKey  winRes = {.ts = win.skey, .groupId = winGpId};
      void*    chIds = taosHashGet(pInfo->pPullDataMap, &winRes, sizeof(SWinKey));
      if (chIds) {
        int32_t childId = getChildIndex(pBlock);
        SArray* chArray = *(void**)chIds;
        int32_t index = taosArraySearchIdx(chArray, &childId, compareInt32Val, TD_EQ);
        if (index != -1) {
          qDebug("===stream===try push delete window%" PRId64 "chId:%d ,continue", win.skey, childId);
          getNextTimeWindow(pInterval, &win, TSDB_ORDER_ASC);
          continue;
        }
      }
      bool res = doDeleteWindow(pOperator, win.skey, winGpId);
      if (pUpWins && res) {
        taosArrayPush(pUpWins, &winRes);
@ -1497,6 +1505,7 @@ void destroyStreamFinalIntervalOperatorInfo(void* param) {
    taosArrayDestroy(*(void**)pIte);
  }
  taosHashCleanup(pInfo->pPullDataMap);
  taosHashCleanup(pInfo->pFinalPullDataMap);
  taosArrayDestroy(pInfo->pPullWins);
  blockDataDestroy(pInfo->pPullDataRes);
  taosArrayDestroy(pInfo->pDelWins);
@ -2067,8 +2076,6 @@ void addPullWindow(SHashObj* pMap, SWinKey* pWinRes, int32_t size) {
  taosHashPut(pMap, pWinRes, sizeof(SWinKey), &childIds, sizeof(void*));
 }
 static int32_t getChildIndex(SSDataBlock* pBlock) { return pBlock->info.childId; }
 static void clearStreamIntervalOperator(SStreamIntervalOperatorInfo* pInfo) {
  tSimpleHashClear(pInfo->aggSup.pResultRowHashTable);
  clearDiskbasedBuf(pInfo->aggSup.pResultBuf);
@ -2112,7 +2119,7 @@ static void doBuildPullDataBlock(SArray* array, int32_t* pIndex, SSDataBlock* pB
  blockDataUpdateTsWindow(pBlock, 0);
 }
-void processPullOver(SSDataBlock* pBlock, SHashObj* pMap, SInterval* pInterval) {
+void processPullOver(SSDataBlock* pBlock, SHashObj* pMap, SHashObj* pFinalMap, SInterval* pInterval, SArray* pPullWins, int32_t numOfCh, SOperatorInfo* pOperator) {
  SColumnInfoData* pStartCol = taosArrayGet(pBlock->pDataBlock, CALCULATE_START_TS_COLUMN_INDEX);
  TSKEY*           tsData = (TSKEY*)pStartCol->pData;
  SColumnInfoData* pEndCol = taosArrayGet(pBlock->pDataBlock, CALCULATE_END_TS_COLUMN_INDEX);
@ -2136,6 +2143,22 @@ void processPullOver(SSDataBlock* pBlock, SHashObj* pMap, SInterval* pInterval)
            taosArrayDestroy(chArray);
            taosHashRemove(pMap, &winRes, sizeof(SWinKey));
            qDebug("===stream===retrive pull data over.window %" PRId64 , winRes.ts);
            void* pFinalCh = taosHashGet(pFinalMap, &winRes, sizeof(SWinKey));
            if (pFinalCh) {
              taosHashRemove(pFinalMap, &winRes, sizeof(SWinKey));
              doDeleteWindow(pOperator, winRes.ts, winRes.groupId);
              STimeWindow nextWin = getFinalTimeWindow(winRes.ts, pInterval);
              SPullWindowInfo pull = {.window = nextWin,
                                      .groupId = winRes.groupId,
                                      .calWin.skey = nextWin.skey,
                                      .calWin.ekey = nextWin.skey};
              // add pull data request
              if (savePullWindow(&pull, pPullWins) == TSDB_CODE_SUCCESS) {
                addPullWindow(pMap, &winRes, numOfCh);
                qDebug("===stream===prepare final retrive for delete %" PRId64 ", size:%d", winRes.ts, numOfCh);
              }
            }
          }
        }
      }
@ -2144,7 +2167,7 @@ void processPullOver(SSDataBlock* pBlock, SHashObj* pMap, SInterval* pInterval)
  }
 }
-static void addRetriveWindow(SArray* wins, SStreamIntervalOperatorInfo* pInfo) {
+static void addRetriveWindow(SArray* wins, SStreamIntervalOperatorInfo* pInfo, int32_t childId) {
  int32_t size = taosArrayGetSize(wins);
  for (int32_t i = 0; i < size; i++) {
    SWinKey*    winKey = taosArrayGet(wins, i);
@ -2161,6 +2184,14 @@ static void addRetriveWindow(SArray* wins, SStreamIntervalOperatorInfo* pInfo) {
        addPullWindow(pInfo->pPullDataMap, winKey, pInfo->numOfChild);
        qDebug("===stream===prepare retrive for delete %" PRId64 ", size:%d", winKey->ts, pInfo->numOfChild);
      }
    } else {
      SArray* chArray = *(void**)chIds;
      int32_t index = taosArraySearchIdx(chArray, &childId, compareInt32Val, TD_EQ);
      qDebug("===stream===check final retrive %" PRId64",chid:%d", winKey->ts, index);
      if (index == -1) {
        qDebug("===stream===add final retrive %" PRId64, winKey->ts);
        taosHashPut(pInfo->pFinalPullDataMap, winKey, sizeof(SWinKey), NULL, 0);
      }
    }
  }
 }
@ -2314,7 +2345,7 @@ static void doStreamIntervalAggImpl(SOperatorInfo* pOperatorInfo, SSDataBlock* p
  }
  while (1) {
    bool isClosed = isCloseWindow(&nextWin, &pInfo->twAggSup);
-    if ((pInfo->ignoreExpiredData && isClosed) || !inSlidingWindow(&pInfo->interval, &nextWin, &pSDataBlock->info)) {
+    if ((pInfo->ignoreExpiredData && isClosed && !IS_FINAL_OP(pInfo)) || !inSlidingWindow(&pInfo->interval, &nextWin, &pSDataBlock->info)) {
      startPos = getNexWindowPos(&pInfo->interval, &pSDataBlock->info, tsCols, startPos, nextWin.ekey, &nextWin);
      if (startPos < 0) {
        break;
@ -2554,7 +2585,8 @@ static SSDataBlock* doStreamFinalIntervalAgg(SOperatorInfo* pOperator) {
      SArray* delWins = taosArrayInit(8, sizeof(SWinKey));
      doDeleteWindows(pOperator, &pInfo->interval, pBlock, delWins, pInfo->pUpdatedMap);
      if (IS_FINAL_OP(pInfo)) {
-        addRetriveWindow(delWins, pInfo);
+        int32_t chId = getChildIndex(pBlock);
        addRetriveWindow(delWins, pInfo, chId);
        if (pBlock->info.type != STREAM_CLEAR) {
          taosArrayAddAll(pInfo->pDelWins, delWins);
        }
@ -2589,7 +2621,7 @@ static SSDataBlock* doStreamFinalIntervalAgg(SOperatorInfo* pOperator) {
      }
      continue;
    } else if (pBlock->info.type == STREAM_PULL_OVER && IS_FINAL_OP(pInfo)) {
-      processPullOver(pBlock, pInfo->pPullDataMap, &pInfo->interval);
+      processPullOver(pBlock, pInfo->pPullDataMap, pInfo->pFinalPullDataMap, &pInfo->interval, pInfo->pPullWins, pInfo->numOfChild, pOperator);
      continue;
    } else if (pBlock->info.type == STREAM_CREATE_CHILD_TABLE) {
      return pBlock;
@ -2772,6 +2804,7 @@ SOperatorInfo* createStreamFinalIntervalOperatorInfo(SOperatorInfo* downstream,
  pInfo->pullIndex = 0;
  _hash_fn_t hashFn = taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY);
  pInfo->pPullDataMap = taosHashInit(64, hashFn, false, HASH_NO_LOCK);
  pInfo->pFinalPullDataMap = taosHashInit(64, hashFn, false, HASH_NO_LOCK);
  pInfo->pPullDataRes = createSpecialDataBlock(STREAM_RETRIEVE);
  pInfo->ignoreExpiredData = pIntervalPhyNode->window.igExpired;
  pInfo->ignoreExpiredDataSaved = false;
@ -4963,6 +4996,7 @@ SOperatorInfo* createStreamIntervalOperatorInfo(SOperatorInfo* downstream, SPhys
  pInfo->pPhyNode = NULL;  // create new child
  pInfo->pPullDataMap = NULL;
  pInfo->pFinalPullDataMap = NULL;
  pInfo->pPullWins = NULL;  // SPullWindowInfo
  pInfo->pullIndex = 0;
  pInfo->pPullDataRes = NULL;
--- a/source/libs/parser/inc/parAst.h
+++ b/source/libs/parser/inc/parAst.h
@ -127,6 +127,7 @@ SNode* createIntervalWindowNode(SAstCreateContext* pCxt, SNode* pInterval, SNode
 SNode* createFillNode(SAstCreateContext* pCxt, EFillMode mode, SNode* pValues);
 SNode* createGroupingSetNode(SAstCreateContext* pCxt, SNode* pNode);
 SNode* createInterpTimeRange(SAstCreateContext* pCxt, SNode* pStart, SNode* pEnd);
 SNode* createInterpTimePoint(SAstCreateContext* pCxt, SNode* pPoint);
 SNode* createWhenThenNode(SAstCreateContext* pCxt, SNode* pWhen, SNode* pThen);
 SNode* createCaseWhenNode(SAstCreateContext* pCxt, SNode* pCase, SNodeList* pWhenThenList, SNode* pElse);
--- a/source/libs/parser/inc/sql.y
+++ b/source/libs/parser/inc/sql.y
@ -1095,6 +1095,8 @@ having_clause_opt(A) ::= HAVING search_condition(B).
 range_opt(A) ::= .                                                                { A = NULL; }
 range_opt(A) ::=
  RANGE NK_LP expr_or_subquery(B) NK_COMMA expr_or_subquery(C) NK_RP.             { A = createInterpTimeRange(pCxt, releaseRawExprNode(pCxt, B), releaseRawExprNode(pCxt, C)); }
 range_opt(A) ::=
  RANGE NK_LP expr_or_subquery(B) NK_RP.                                          { A = createInterpTimePoint(pCxt, releaseRawExprNode(pCxt, B)); }
 every_opt(A) ::= .                                                                { A = NULL; }
 every_opt(A) ::= EVERY NK_LP duration_literal(B) NK_RP.                           { A = releaseRawExprNode(pCxt, B); }
--- a/source/libs/parser/src/parAstCreater.c
+++ b/source/libs/parser/src/parAstCreater.c
@ -695,6 +695,11 @@ SNode* createInterpTimeRange(SAstCreateContext* pCxt, SNode* pStart, SNode* pEnd
  return createBetweenAnd(pCxt, createPrimaryKeyCol(pCxt, NULL), pStart, pEnd);
 }
 SNode* createInterpTimePoint(SAstCreateContext* pCxt, SNode* pPoint) {
  CHECK_PARSER_STATUS(pCxt);
  return createOperatorNode(pCxt, OP_TYPE_EQUAL, createPrimaryKeyCol(pCxt, NULL), pPoint);
 }
 SNode* createWhenThenNode(SAstCreateContext* pCxt, SNode* pWhen, SNode* pThen) {
  CHECK_PARSER_STATUS(pCxt);
  SWhenThenNode* pWhenThen = (SWhenThenNode*)nodesMakeNode(QUERY_NODE_WHEN_THEN);
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@ -707,6 +707,10 @@ static bool isWindowPseudoColumnFunc(const SNode* pNode) {
  return (QUERY_NODE_FUNCTION == nodeType(pNode) && fmIsWindowPseudoColumnFunc(((SFunctionNode*)pNode)->funcId));
 }
 static bool isInterpFunc(const SNode* pNode) {
  return (QUERY_NODE_FUNCTION == nodeType(pNode) && fmIsInterpFunc(((SFunctionNode*)pNode)->funcId));
 }
 static bool isInterpPseudoColumnFunc(const SNode* pNode) {
  return (QUERY_NODE_FUNCTION == nodeType(pNode) && fmIsInterpPseudoColumnFunc(((SFunctionNode*)pNode)->funcId));
 }
@ -3030,7 +3034,7 @@ static int32_t translateOrderBy(STranslateContext* pCxt, SSelectStmt* pSelect) {
 }
 static EDealRes needFillImpl(SNode* pNode, void* pContext) {
-  if (isAggFunc(pNode) && FUNCTION_TYPE_GROUP_KEY != ((SFunctionNode*)pNode)->funcType) {
+  if ((isAggFunc(pNode) || isInterpFunc(pNode)) && FUNCTION_TYPE_GROUP_KEY != ((SFunctionNode*)pNode)->funcType) {
    *(bool*)pContext = true;
    return DEAL_RES_END;
  }
@ -3054,7 +3058,7 @@ static int32_t convertFillValue(STranslateContext* pCxt, SDataType dt, SNodeList
    code = scalarCalculateConstants(pCaseFunc, &pCell->pNode);
  }
  if (TSDB_CODE_SUCCESS == code && QUERY_NODE_VALUE != nodeType(pCell->pNode)) {
-    code = generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_WRONG_VALUE_TYPE, "Fill value is just a constant");
+    code = generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_WRONG_VALUE_TYPE, "Fill value can only accept constant");
  } else if (TSDB_CODE_SUCCESS != code) {
    code = generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_WRONG_VALUE_TYPE, "Filled data type mismatch");
  }
@ -3078,6 +3082,7 @@ static int32_t checkFillValues(STranslateContext* pCxt, SFillNode* pFill, SNodeL
      if (TSDB_CODE_SUCCESS != code) {
        return code;
      }
      ++fillNo;
    }
  }
@ -3497,6 +3502,22 @@ static int32_t createDefaultFillNode(STranslateContext* pCxt, SNode** pOutput) {
  return TSDB_CODE_SUCCESS;
 }
 static int32_t createDefaultEveryNode(STranslateContext* pCxt, SNode** pOutput) {
  SValueNode* pEvery = (SValueNode*)nodesMakeNode(QUERY_NODE_VALUE);
  if (NULL == pEvery) {
    return TSDB_CODE_OUT_OF_MEMORY;
  }
  pEvery->node.resType.type = TSDB_DATA_TYPE_BIGINT;
  pEvery->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_BIGINT].bytes;
  pEvery->isDuration = true;
  pEvery->literal = taosStrdup("1s");
  *pOutput = (SNode*)pEvery;
  return TSDB_CODE_SUCCESS;
 }
 static int32_t checkEvery(STranslateContext* pCxt, SValueNode* pInterval) {
  int32_t len = strlen(pInterval->literal);
@ -3512,7 +3533,12 @@ static int32_t checkEvery(STranslateContext* pCxt, SValueNode* pInterval) {
 static int32_t translateInterpEvery(STranslateContext* pCxt, SNode** pEvery) {
  int32_t code = TSDB_CODE_SUCCESS;
  if (NULL == *pEvery) {
    code = createDefaultEveryNode(pCxt, pEvery);
  }
  if (TSDB_CODE_SUCCESS == code) {
    code = checkEvery(pCxt, (SValueNode*)(*pEvery));
  }
  if (TSDB_CODE_SUCCESS == code) {
    code = translateExpr(pCxt, pEvery);
  }
@ -3541,6 +3567,9 @@ static int32_t translateInterpFill(STranslateContext* pCxt, SSelectStmt* pSelect
  if (TSDB_CODE_SUCCESS == code) {
    code = checkFill(pCxt, (SFillNode*)pSelect->pFill, (SValueNode*)pSelect->pEvery, true);
  }
  if (TSDB_CODE_SUCCESS == code) {
    code = checkFillValues(pCxt, (SFillNode*)pSelect->pFill, pSelect->pProjectionList);
  }
  return code;
 }
@ -3558,9 +3587,13 @@ static int32_t translateInterp(STranslateContext* pCxt, SSelectStmt* pSelect) {
  }
  if (NULL == pSelect->pRange || NULL == pSelect->pEvery || NULL == pSelect->pFill) {
    if (pSelect->pRange != NULL && QUERY_NODE_OPERATOR == nodeType(pSelect->pRange) && pSelect->pEvery == NULL) {
      // single point interp every can be omitted
    } else {
      return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_INTERP_CLAUSE,
                                     "Missing RANGE clause, EVERY clause or FILL clause");
    }
  }
  int32_t code = translateExpr(pCxt, &pSelect->pRange);
  if (TSDB_CODE_SUCCESS == code) {
--- a/source/libs/parser/src/sql.c
+++ b/source/libs/parser/src/sql.c
--- a/source/libs/stream/CMakeLists.txt
+++ b/source/libs/stream/CMakeLists.txt
@ -11,7 +11,7 @@ if(${BUILD_WITH_ROCKSDB})
  IF (TD_LINUX)
  target_link_libraries(
    stream
-    PUBLIC rocksdb-shared tdb
+    PUBLIC rocksdb tdb
    PRIVATE  os util transport qcom executor wal index
  )
  ELSE() 
--- a/source/libs/stream/inc/streamInc.h
+++ b/source/libs/stream/inc/streamInc.h
@ -36,7 +36,8 @@ static SStreamGlobalEnv streamEnv;
 int32_t streamDispatchStreamBlock(SStreamTask* pTask);
 SStreamDataBlock* createStreamDataFromDispatchMsg(const SStreamDispatchReq* pReq, int32_t blockType, int32_t srcVg);
-SStreamDataBlock* createStreamBlockFromResults(SStreamQueueItem* pItem, SStreamTask* pTask, int64_t resultSize, SArray* pRes);
+SStreamDataBlock* createStreamBlockFromResults(SStreamQueueItem* pItem, SStreamTask* pTask, int64_t resultSize,
                                               SArray* pRes);
 void              destroyStreamDataBlock(SStreamDataBlock* pBlock);
 int32_t streamRetrieveReqToData(const SStreamRetrieveReq* pReq, SStreamDataBlock* pData);
@ -53,6 +54,8 @@ int32_t streamDispatchOneRecoverFinishReq(SStreamTask* pTask, const SStreamRecov
 SStreamQueueItem* streamMergeQueueItem(SStreamQueueItem* dst, SStreamQueueItem* pElem);
 extern int32_t streamBackendId;
 #ifdef __cplusplus
 }
 #endif
--- a/source/libs/stream/src/streamBackendRocksdb.c
+++ b/source/libs/stream/src/streamBackendRocksdb.c
@ -16,7 +16,9 @@
 #include "streamBackendRocksdb.h"
 #include "executor.h"
 #include "query.h"
 #include "streamInc.h"
 #include "tcommon.h"
 #include "tref.h"
 typedef struct SCompactFilteFactory {
  void* status;
@ -79,8 +81,8 @@ const char* compareParKeyName(void* name);
 const char* comparePartagKeyName(void* name);
 void* streamBackendInit(const char* path) {
-  qDebug("init stream backend");
+  qDebug("start to init stream backend at %s", path);
-  SBackendHandle* pHandle = calloc(1, sizeof(SBackendHandle));
+  SBackendHandle* pHandle = taosMemoryCalloc(1, sizeof(SBackendHandle));
  pHandle->list = tdListNew(sizeof(SCfComparator));
  taosThreadMutexInit(&pHandle->mutex, NULL);
  taosThreadMutexInit(&pHandle->cfMutex, NULL);
@ -119,6 +121,7 @@ void* streamBackendInit(const char* path) {
    if (err != NULL) {
      qError("failed to open rocksdb, path:%s, reason:%s", path, err);
      taosMemoryFreeClear(err);
      goto _EXIT;
    }
  } else {
    /*
@ -129,6 +132,7 @@ void* streamBackendInit(const char* path) {
  if (cfs != NULL) {
    rocksdb_list_column_families_destroy(cfs, nCf);
  }
  qDebug("succ to init stream backend at %s, backend:%p", path, pHandle);
  return (void*)pHandle;
 _EXIT:
@ -140,7 +144,8 @@ _EXIT:
  taosHashCleanup(pHandle->cfInst);
  rocksdb_compactionfilterfactory_destroy(pHandle->filterFactory);
  tdListFree(pHandle->list);
-  free(pHandle);
+  taosMemoryFree(pHandle);
  qDebug("failed to init stream backend at %s", path);
  return NULL;
 }
 void streamBackendCleanup(void* arg) {
@ -168,19 +173,20 @@ void streamBackendCleanup(void* arg) {
  rocksdb_env_destroy(pHandle->env);
  rocksdb_cache_destroy(pHandle->cache);
  taosThreadMutexDestroy(&pHandle->mutex);
  SListNode* head = tdListPopHead(pHandle->list);
  while (head != NULL) {
    streamStateDestroyCompar(head->data);
    taosMemoryFree(head);
    head = tdListPopHead(pHandle->list);
  }
-  // rocksdb_compactionfilterfactory_destroy(pHandle->filterFactory);
+
  tdListFree(pHandle->list);
  taosThreadMutexDestroy(&pHandle->mutex);
  taosThreadMutexDestroy(&pHandle->cfMutex);
  taosMemoryFree(pHandle);
-
+  qDebug("destroy stream backend backend:%p", pHandle);
  return;
 }
 SListNode* streamBackendAddCompare(void* backend, void* arg) {
@ -803,7 +809,8 @@ int32_t streamStateOpenBackendCf(void* backend, char* name, char** cfs, int32_t
  return 0;
 }
 int streamStateOpenBackend(void* backend, SStreamState* pState) {
-  qInfo("start to open backend, %p 0x%" PRIx64 "-%d", pState, pState->streamId, pState->taskId);
+  qInfo("start to open state %p on backend %p 0x%" PRIx64 "-%d", pState, backend, pState->streamId, pState->taskId);
  taosAcquireRef(streamBackendId, pState->streamBackendRid);
  SBackendHandle* handle = backend;
  sprintf(pState->pTdbState->idstr, "0x%" PRIx64 "-%d", pState->streamId, pState->taskId);
@ -866,7 +873,7 @@ int streamStateOpenBackend(void* backend, SStreamState* pState) {
  SCfComparator compare = {.comp = pCompare, .numOfComp = cfLen};
  pState->pTdbState->pComparNode = streamBackendAddCompare(handle, &compare);
  // rocksdb_writeoptions_disable_WAL(pState->pTdbState->writeOpts, 1);
-  qInfo("succ to open backend, %p, 0x%" PRIx64 "-%d", pState, pState->streamId, pState->taskId);
+  qInfo("succ to open state %p on backend, %p, 0x%" PRIx64 "-%d", pState, handle, pState->streamId, pState->taskId);
  return 0;
 }
@ -882,8 +889,8 @@ void streamStateCloseBackend(SStreamState* pState, bool remove) {
  taosThreadMutexUnlock(&pHandle->cfMutex);
  char* status[] = {"close", "drop"};
-  qInfo("start to %s backend, %p, 0x%" PRIx64 "-%d", status[remove == false ? 0 : 1], pState, pState->streamId,
+  qInfo("start to close %s state %p on backend %p 0x%" PRIx64 "-%d", status[remove == false ? 0 : 1], pState, pHandle,
-        pState->taskId);
+        pState->streamId, pState->taskId);
  if (pState->pTdbState->rocksdb == NULL) {
    return;
  }
@ -938,6 +945,7 @@ void streamStateCloseBackend(SStreamState* pState, bool remove) {
  taosThreadRwlockDestroy(&pState->pTdbState->rwLock);
  pState->pTdbState->rocksdb = NULL;
  taosReleaseRef(streamBackendId, pState->streamBackendRid);
 }
 void streamStateDestroyCompar(void* arg) {
  SCfComparator* comp = (SCfComparator*)arg;
--- a/source/libs/stream/src/streamDispatch.c
+++ b/source/libs/stream/src/streamDispatch.c
@ -15,6 +15,13 @@
 #include "streamInc.h"
 #define MAX_BLOCK_NAME_NUM 1024
 typedef struct SBlockName {
  uint32_t hashValue;
  char     parTbName[TSDB_TABLE_NAME_LEN];
 } SBlockName;
 int32_t tEncodeStreamDispatchReq(SEncoder* pEncoder, const SStreamDispatchReq* pReq) {
  if (tStartEncode(pEncoder) < 0) return -1;
  if (tEncodeI64(pEncoder, pReq->streamId) < 0) return -1;
@ -331,6 +338,20 @@ FAIL:
 int32_t streamSearchAndAddBlock(SStreamTask* pTask, SStreamDispatchReq* pReqs, SSDataBlock* pDataBlock, int32_t vgSz,
                                int64_t groupId) {
  uint32_t   hashValue = 0;
  SArray* vgInfo = pTask->shuffleDispatcher.dbInfo.pVgroupInfos;
  if (pTask->pNameMap == NULL) {
    pTask->pNameMap = tSimpleHashInit(1024, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT));
  }
  void* pVal = tSimpleHashGet(pTask->pNameMap, &groupId, sizeof(int64_t));
  if (pVal) {
    SBlockName* pBln = (SBlockName*)pVal;
    hashValue = pBln->hashValue;
    if (!pDataBlock->info.parTbName[0]) {
      memcpy(pDataBlock->info.parTbName, pBln->parTbName, strlen(pBln->parTbName));
    }
  } else {
    char* ctbName = taosMemoryCalloc(1, TSDB_TABLE_FNAME_LEN);
    if (ctbName == NULL) {
      return -1;
@ -339,18 +360,24 @@ int32_t streamSearchAndAddBlock(SStreamTask* pTask, SStreamDispatchReq* pReqs, S
    if (pDataBlock->info.parTbName[0]) {
      snprintf(ctbName, TSDB_TABLE_NAME_LEN, "%s.%s", pTask->shuffleDispatcher.dbInfo.db, pDataBlock->info.parTbName);
    } else {
-    char* ctbShortName = buildCtbNameByGroupId(pTask->shuffleDispatcher.stbFullName, groupId);
+      buildCtbNameByGroupIdImpl(pTask->shuffleDispatcher.stbFullName, groupId, pDataBlock->info.parTbName);
-    snprintf(ctbName, TSDB_TABLE_NAME_LEN, "%s.%s", pTask->shuffleDispatcher.dbInfo.db, ctbShortName);
+      snprintf(ctbName, TSDB_TABLE_NAME_LEN, "%s.%s", pTask->shuffleDispatcher.dbInfo.db, pDataBlock->info.parTbName);
    taosMemoryFree(ctbShortName);
    }
    SArray* vgInfo = pTask->shuffleDispatcher.dbInfo.pVgroupInfos;
    /*uint32_t hashValue = MurmurHash3_32(ctbName, strlen(ctbName));*/
    SUseDbRsp* pDbInfo = &pTask->shuffleDispatcher.dbInfo;
-  uint32_t   hashValue =
+    hashValue =
        taosGetTbHashVal(ctbName, strlen(ctbName), pDbInfo->hashMethod, pDbInfo->hashPrefix, pDbInfo->hashSuffix);
    taosMemoryFree(ctbName);
    SBlockName bln = {0};
    bln.hashValue = hashValue;
    memcpy(bln.parTbName, pDataBlock->info.parTbName, strlen(pDataBlock->info.parTbName));
    if (tSimpleHashGetSize(pTask->pNameMap) < MAX_BLOCK_NAME_NUM) {
      tSimpleHashPut(pTask->pNameMap, &groupId, sizeof(int64_t), &bln, sizeof(SBlockName));
    }
  }
  bool found = false;
  // TODO: optimize search
--- a/source/libs/stream/src/streamMeta.c
+++ b/source/libs/stream/src/streamMeta.c
@ -20,7 +20,7 @@
 #include "ttimer.h"
 static TdThreadOnce streamMetaModuleInit = PTHREAD_ONCE_INIT;
-static int32_t      streamBackendId = 0;
+int32_t             streamBackendId = 0;
 static void         streamMetaEnvInit() { streamBackendId = taosOpenRef(20, streamBackendCleanup); }
 void streamMetaInit() { taosThreadOnce(&streamMetaModuleInit, streamMetaEnvInit); }
@ -79,7 +79,6 @@ SStreamMeta* streamMetaOpen(const char* path, void* ahandle, FTaskExpand expandF
  pMeta->vgId = vgId;
  pMeta->ahandle = ahandle;
  pMeta->expandFunc = expandFunc;
  pMeta->streamBackendId = streamBackendId;
  memset(streamPath, 0, len);
  sprintf(streamPath, "%s/%s", pMeta->path, "state");
--- a/source/libs/stream/src/streamState.c
+++ b/source/libs/stream/src/streamState.c
@ -119,10 +119,10 @@ SStreamState* streamStateOpen(char* path, void* pTask, bool specPath, int32_t sz
 #ifdef USE_ROCKSDB
  SStreamMeta* pMeta = pStreamTask->pMeta;
-  taosAcquireRef(pMeta->streamBackendId, pMeta->streamBackendRid);
+  pState->streamBackendRid = pMeta->streamBackendRid;
  int code = streamStateOpenBackend(pMeta->streamBackend, pState);
  if (code == -1) {
-    taosReleaseRef(pMeta->streamBackendId, pMeta->streamBackendRid);
+    taosReleaseRef(streamBackendId, pMeta->streamBackendRid);
    taosMemoryFree(pState);
    pState = NULL;
  }
@ -222,9 +222,7 @@ _err:
 void streamStateClose(SStreamState* pState, bool remove) {
  SStreamTask* pTask = pState->pTdbState->pOwner;
 #ifdef USE_ROCKSDB
  // streamStateCloseBackend(pState);
  streamStateDestroy(pState, remove);
  taosReleaseRef(pTask->pMeta->streamBackendId, pTask->pMeta->streamBackendRid);
 #else
  tdbCommit(pState->pTdbState->db, pState->pTdbState->txn);
  tdbPostCommit(pState->pTdbState->db, pState->pTdbState->txn);
--- a/source/libs/stream/src/streamTask.c
+++ b/source/libs/stream/src/streamTask.c
@ -224,5 +224,9 @@ void tFreeStreamTask(SStreamTask* pTask) {
    taosMemoryFree((void*)pTask->id.idStr);
  }
  if (pTask->pNameMap) {
    tSimpleHashCleanup(pTask->pNameMap);
  }
  taosMemoryFree(pTask);
 }
--- a/source/libs/stream/src/tstreamFileState.c
+++ b/source/libs/stream/src/tstreamFileState.c
@ -419,7 +419,7 @@ int32_t deleteExpiredCheckPoint(SStreamFileState* pFileState, TSKEY mark) {
    if (code != 0 || len == 0 || val == NULL) {
      return TSDB_CODE_FAILED;
    }
-    memcpy(val, buf, len);
+    memcpy(buf, val, len);
    buf[len] = 0;
    maxCheckPointId = atol((char*)buf);
    taosMemoryFree(val);
@ -433,7 +433,7 @@ int32_t deleteExpiredCheckPoint(SStreamFileState* pFileState, TSKEY mark) {
    if (code != 0) {
      return TSDB_CODE_FAILED;
    }
-    memcpy(val, buf, len);
+    memcpy(buf, val, len);
    buf[len] = 0;
    taosMemoryFree(val);
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@ -616,6 +616,8 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/rowlength64k_4.py -Q 2
 ,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/rowlength64k_4.py -Q 3
 ,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/rowlength64k_4.py -Q 4
 ,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/precisionUS.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/precisionNS.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 0-others/show.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 0-others/information_schema.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/abs.py
--- a/tests/pytest/tools/taosdumpTest.py
+++ b/tests/pytest/tools/taosdumpTest.py
@ -92,9 +92,9 @@ class TDTestCase:
        else:
            tdLog.info("taosdump found: %s" % binPath)
-        os.system("%s -y --databases db -o ./taosdumptest/tmp1" % binPath)
+        os.system("%s --databases db -o ./taosdumptest/tmp1" % binPath)
        os.system(
-            "%s -y --databases db1 -o ./taosdumptest/tmp2" %
+            "%s --databases db1 -o ./taosdumptest/tmp2" %
            binPath)
        tdSql.execute("drop database db")
@ -172,7 +172,7 @@ class TDTestCase:
        tdSql.query("show stables")
        tdSql.checkRows(2)
        os.system(
-            "%s -y --databases db12312313231231321312312312_323 -o ./taosdumptest/tmp1" %
+            "%s --databases db12312313231231321312312312_323 -o ./taosdumptest/tmp1" %
            binPath)
        tdSql.execute("drop database db12312313231231321312312312_323")
        os.system("%s -i ./taosdumptest/tmp1" % binPath)
--- a/tests/pytest/tools/taosdumpTest2.py
+++ b/tests/pytest/tools/taosdumpTest2.py
@ -97,7 +97,7 @@ class TDTestCase:
        tdSql.query("show databases")
        tdSql.checkRows(2)
-        os.system("%s -i ./taosdumptest/tmp -y" % binPath)
+        os.system("%s -i ./taosdumptest/tmp" % binPath)
        tdSql.query("show databases")
        tdSql.checkRows(3)
@ -125,13 +125,13 @@ class TDTestCase:
        os.system("rm ./taosdumptest/tmp/*.sql")
        os.system("rm ./taosdumptest/tmp/*.avro*")
        os.system("rm -rf ./taosdumptest/tmp/taosdump.*")
-        os.system("%s -D test -o ./taosdumptest/tmp -y" % binPath)
+        os.system("%s -D test -o ./taosdumptest/tmp" % binPath)
        tdSql.execute("drop database test")
        tdSql.query("show databases")
        tdSql.checkRows(3)
-        os.system("%s -i ./taosdumptest/tmp -y" % binPath)
+        os.system("%s -i ./taosdumptest/tmp" % binPath)
        tdSql.execute("use test")
        tdSql.query("show stables")
--- a/tests/pytest/tools/taosdumpTestNanoSupport.py
+++ b/tests/pytest/tools/taosdumpTestNanoSupport.py
@ -134,15 +134,15 @@ class TDTestCase:
        # dump all data
        os.system(
-            "%s -y -g --databases timedb1 -o ./taosdumptest/dumptmp1" %
+            "%s -g --databases timedb1 -o ./taosdumptest/dumptmp1" %
            binPath)
        # dump part data with -S  -E
        os.system(
-            '%s -y -g --databases timedb1 -S 1625068810000000000 -E 1625068860000000000  -o ./taosdumptest/dumptmp2 ' %
+            '%s -g --databases timedb1 -S 1625068810000000000 -E 1625068860000000000  -o ./taosdumptest/dumptmp2 ' %
            binPath)
        os.system(
-            '%s -y -g --databases timedb1 -S 1625068810000000000  -o ./taosdumptest/dumptmp3  ' %
+            '%s -g --databases timedb1 -S 1625068810000000000  -o ./taosdumptest/dumptmp3  ' %
            binPath)
        tdSql.execute("drop database timedb1")
@ -200,14 +200,14 @@ class TDTestCase:
        self.createdb(precision="us")
        os.system(
-            "%s -y -g --databases timedb1 -o ./taosdumptest/dumptmp1" %
+            "%s -g --databases timedb1 -o ./taosdumptest/dumptmp1" %
            binPath)
        os.system(
-            '%s -y -g --databases timedb1 -S 1625068810000000 -E 1625068860000000  -o ./taosdumptest/dumptmp2 ' %
+            '%s -g --databases timedb1 -S 1625068810000000 -E 1625068860000000  -o ./taosdumptest/dumptmp2 ' %
            binPath)
        os.system(
-            '%s -y -g --databases timedb1 -S 1625068810000000  -o ./taosdumptest/dumptmp3  ' %
+            '%s -g --databases timedb1 -S 1625068810000000  -o ./taosdumptest/dumptmp3  ' %
            binPath)
        os.system("%s -i ./taosdumptest/dumptmp1" % binPath)
@ -269,14 +269,14 @@ class TDTestCase:
        self.createdb(precision="ms")
        os.system(
-            "%s -y -g --databases timedb1 -o ./taosdumptest/dumptmp1" %
+            "%s -g --databases timedb1 -o ./taosdumptest/dumptmp1" %
            binPath)
        os.system(
-            '%s -y -g --databases timedb1 -S 1625068810000 -E 1625068860000  -o ./taosdumptest/dumptmp2 ' %
+            '%s -g --databases timedb1 -S 1625068810000 -E 1625068860000  -o ./taosdumptest/dumptmp2 ' %
            binPath)
        os.system(
-            '%s -y -g --databases timedb1 -S 1625068810000  -o ./taosdumptest/dumptmp3  ' %
+            '%s -g --databases timedb1 -S 1625068810000  -o ./taosdumptest/dumptmp3  ' %
            binPath)
        os.system("%s -i ./taosdumptest/dumptmp1" % binPath)
--- a/tests/script/tsim/stream/distributeInterval0.sim
+++ b/tests/script/tsim/stream/distributeInterval0.sim
@ -1,36 +1,11 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
 system sh/exec.sh -n dnode1 -s start 
 sleep 50
 sql connect
 sql create dnode $hostname2 port 7200
 system sh/exec.sh -n dnode2 -s start
 print ===== step1
 $x = 0
 step1:
 	$x = $x + 1
 	sleep 1000
 	if $x == 10 then
 	  print ====> dnode not ready!
 		return -1
 	endi
 sql select * from information_schema.ins_dnodes
 print ===> $data00 $data01 $data02 $data03 $data04 $data05
 print ===> $data10 $data11 $data12 $data13 $data14 $data15
 if $rows != 2 then
  return -1
 endi
 if $data(1)[4] != ready then
  goto step1
 endi
 if $data(2)[4] != ready then
  goto step1
 endi
 print ===== step2
 sql drop stream if exists stream_t1;
@ -248,10 +223,56 @@ sql insert into ts3 values(1648791223002,2,2,3,1.1);
 sql insert into ts4 values(1648791233003,3,2,3,2.1);
 sql insert into ts3 values(1648791243004,4,2,43,73.1);
 sql insert into ts4 values(1648791213002,24,22,23,4.1);
 $loop_count = 0
 loop032:
 $loop_count = $loop_count + 1
 if $loop_count == 30 then
  return -1
 endi
 sleep 1000
 print 6-0 select * from streamtST1;
 sql select * from streamtST1;
 if $rows != 4 then
  print =====rows=$rows
  goto loop032
 endi
 if $data01 != 8 then
  print =6====data01=$data01
  goto loop032
 endi
 sql insert into ts3 values(1648791243005,4,20,3,3.1);
 sql insert into ts4 values(1648791243006,4,2,3,3.1) (1648791243007,4,2,3,3.1) ;
 sql insert into ts3 values(1648791243008,4,2,30,3.1) (1648791243009,4,2,3,3.1)  (1648791243010,4,2,3,3.1)  ;
 sql insert into ts4 values(1648791243011,4,2,3,3.1) (1648791243012,34,32,33,3.1)  (1648791243013,4,2,3,3.1) (1648791243014,4,2,13,3.1);
 $loop_count = 0
 loop033:
 $loop_count = $loop_count + 1
 if $loop_count == 30 then
  return -1
 endi
 sleep 1000
 print 6-1 select * from streamtST1;
 sql select * from streamtST1;
 if $rows != 4 then
  print =====rows=$rows
  goto loop033
 endi
 if $data01 != 8 then
  print =6====data01=$data01
  goto loop033
 endi
 sql insert into ts3 values(1648791243005,4,42,3,3.1) (1648791243003,4,2,33,3.1) (1648791243006,4,2,3,3.1) (1648791213001,1,52,13,1.0) (1648791223001,22,22,83,1.1) ;
 $loop_count = 0
--- a/tests/script/tsim/stream/ignoreExpiredData.sim
+++ b/tests/script/tsim/stream/ignoreExpiredData.sim
@ -132,12 +132,12 @@ if $loop_count == 10 then
  return -1
 endi
-if $data01 != 1 then
+if $data01 != 2 then
  print =====data01=$data01
  goto loop4
 endi
-if $data02 != 1 then
+if $data02 != 2 then
  print =====data02=$data02
  goto loop4
 endi
--- a/tests/script/tsim/stream/sliding.sim
+++ b/tests/script/tsim/stream/sliding.sim
@ -576,13 +576,6 @@ $loop_count = 0
 print step 7
 loop4:
 sleep 100
 $loop_count = $loop_count + 1
 if $loop_count == 10 then
  return -1
 endi
 sql create database test3 vgroups 6;
 sql use test3;
--- a/tests/system-test/1-insert/precisionNS.py
+++ b/tests/system-test/1-insert/precisionNS.py
@ -0,0 +1,293 @@
 ###################################################################
 #           Copyright (c) 2016 by TAOS Technologies, Inc.
 #                     All rights reserved.
 #
 #  This file is proprietary and confidential to TAOS Technologies.
 #  No part of this file may be reproduced, stored, transmitted,
 #  disclosed or used in any form or by any means other than as
 #  expressly provided by the written permission from Jianhui Tao
 #
 ###################################################################
 # -*- coding: utf-8 -*-
 import sys
 import random
 import time
 import taos
 from util.log import *
 from util.cases import *
 from util.sql import *
 class TDTestCase:
    # get col value and total max min ...
    def getColsValue(self, i, j):
        # c1 value
        if random.randint(1, 10) == 5:
            c1 = None
        else:
            c1 = 1
        # c2 value
        if j % 3200 == 0:
            c2 = 8764231
        elif random.randint(1, 10) == 5:
            c2 = None
        else:
            c2 = random.randint(-87654297, 98765321)    
        value = f"({self.ts}, "
        # c1
        if c1 is None:
            value += "null,"
        else:
            self.c1Cnt += 1
            value += f"{c1},"
        # c2
        if c2 is None:
            value += "null,"
        else:
            value += f"{c2},"
            # total count
            self.c2Cnt += 1
            # max
            if self.c2Max is None:
                self.c2Max = c2
            else:
                if c2 > self.c2Max:
                    self.c2Max = c2
            # min
            if self.c2Min is None:
                self.c2Min = c2
            else:
                if c2 < self.c2Min:
                    self.c2Min = c2
            # sum
            if self.c2Sum is None:
                self.c2Sum = c2
            else:
                self.c2Sum += c2
        # c3 same with ts
        value += f"{self.ts})"
        # move next
        self.ts += 1
        return value
    # insert data
    def insertData(self):
        tdLog.info("insert data ....")
        sqls = ""
        for i in range(self.childCnt):
            # insert child table
            values = ""
            pre_insert = f"insert into t{i} values "
            for j in range(self.childRow):
                if values == "":
                    values = self.getColsValue(i, j)
                else:
                    values += "," + self.getColsValue(i, j)
                # batch insert    
                if j % self.batchSize == 0  and values != "":
                    sql = pre_insert + values
                    tdSql.execute(sql)
                    values = ""
            # append last
            if values != "":
                sql = pre_insert + values
                tdSql.execute(sql)
                values = ""
        sql = "flush database db;"
        tdLog.info(sql)
        tdSql.execute(sql)
        # insert finished
        tdLog.info(f"insert data successfully.\n"
        f"                            inserted child table = {self.childCnt}\n"
        f"                            inserted child rows  = {self.childRow}\n"
        f"                            total inserted rows  = {self.childCnt*self.childRow}\n")
        return
    # prepareEnv
    def prepareEnv(self):
        # init                
        self.ts = 1680000000000*1000*1000
        self.childCnt = 5
        self.childRow = 10000
        self.batchSize = 5000
        # total
        self.c1Cnt = 0
        self.c2Cnt = 0
        self.c2Max = None
        self.c2Min = None
        self.c2Sum = None
        # create database  db
        sql = f"create database db vgroups 2 precision 'ns' "
        tdLog.info(sql)
        tdSql.execute(sql)
        sql = f"use db"
        tdSql.execute(sql)
        # create super talbe st
        sql = f"create table st(ts timestamp, c1 int, c2 bigint, ts1 timestamp) tags(area int)"
        tdLog.info(sql)
        tdSql.execute(sql)
        # create child table
        for i in range(self.childCnt):
            sql = f"create table t{i} using st tags({i}) "
            tdSql.execute(sql)
        # create stream
        sql = "create stream ma into sta as select count(ts) from st interval(100b)"
        tdLog.info(sql)
        tdSql.execute(sql)
        # insert data
        self.insertData()
    # check data correct
    def checkExpect(self, sql, expectVal):
        tdSql.query(sql)
        rowCnt = tdSql.getRows()
        for i in range(rowCnt):
            val = tdSql.getData(i,0)
            if val != expectVal:
                tdLog.exit(f"Not expect . query={val} expect={expectVal} i={i} sql={sql}")
                return False
        tdLog.info(f"check expect ok. sql={sql} expect ={expectVal} rowCnt={rowCnt}")
        return True
    # check time macro
    def checkTimeMacro(self):
        # 2 week
        val = 2
        nsval = val*7*24*60*60*1000*1000*1000
        expectVal = self.childCnt * self.childRow
        sql = f"select count(ts) from st where timediff(ts - {val}w, ts1) = {nsval} "
        self.checkExpect(sql, expectVal)
        # 20 day
        val = 20
        nsval = val*24*60*60*1000*1000*1000
        uint = "d"
        sql = f"select count(ts) from st where timediff(ts - {val}{uint}, ts1) = {nsval} "
        self.checkExpect(sql, expectVal)
        # 30 hour
        val = 30
        nsval = val*60*60*1000*1000*1000
        uint = "h"
        sql = f"select count(ts) from st where timediff(ts - {val}{uint}, ts1) = {nsval} "
        self.checkExpect(sql, expectVal)
        # 90 minutes
        val = 90
        nsval = val*60*1000*1000*1000
        uint = "m"
        sql = f"select count(ts) from st where timediff(ts - {val}{uint}, ts1) = {nsval} "
        self.checkExpect(sql, expectVal)
        # 2s
        val = 2
        nsval = val*1000*1000*1000
        uint = "s"
        sql = f"select count(ts) from st where timediff(ts - {val}{uint}, ts1) = {nsval} "
        self.checkExpect(sql, expectVal)
        # 20a
        val = 5
        nsval = val*1000*1000
        uint = "a"
        sql = f"select count(ts) from st where timediff(ts - {val}{uint}, ts1) = {nsval} "
        self.checkExpect(sql, expectVal)
        # 300u
        val = 300
        nsval = val*1000
        uint = "u"
        sql = f"select count(ts) from st where timediff(ts - {val}{uint}, ts1) = {nsval} "
        self.checkExpect(sql, expectVal)
        # 8b
        val = 8
        sql = f"select timediff(ts - {val}b, ts1) from st "
        self.checkExpect(sql, val)
    # init
    def init(self, conn, logSql, replicaVar=1):
        seed = time.clock_gettime(time.CLOCK_REALTIME)
        random.seed(seed)
        self.replicaVar = int(replicaVar)
        tdLog.debug(f"start to excute {__file__}")
        tdSql.init(conn.cursor(), True)
    # where
    def checkWhere(self):
        cnt = 300
        start = self.ts - cnt
        sql = f"select count(ts) from st where ts >= {start} and ts <= {self.ts}"
        self.checkExpect(sql, cnt)
        for i in range(50):
            cnt =  random.randint(1,40000)
            base = 2000
            start = self.ts - cnt - base
            end   = self.ts - base 
            sql = f"select count(ts) from st where ts >= {start} and ts < {end}"
            self.checkExpect(sql, cnt)
    # stream
    def checkStream(self):
        allRows = self.childCnt * self.childRow
        # ensure write data is expected
        sql = "select count(*) from (select diff(ts) as a from (select ts from st order by ts asc)) where a=1;"
        self.checkExpect(sql, allRows - 1)
        # stream count is ok
        sql =f"select count(*) from sta"
        cnt = int(allRows / 100) - 1 # last window is not close, so need reduce one
        self.checkExpect(sql, cnt)
        # check fields
        sql =f"select count(*) from sta where `count(ts)` != 100"
        self.checkExpect(sql, 0)
        # check timestamp
        sql =f"select count(*) from (select diff(`_wstart`) from sta)"
        self.checkExpect(sql, cnt - 1)
        sql =f"select count(*) from (select diff(`_wstart`) as a from sta) where a != 100"
        self.checkExpect(sql, 0)
    # run
    def run(self):
        # prepare env
        self.prepareEnv()
        # time macro like 1w 1d 1h 1m 1s 1a 1u 1b 
        self.checkTimeMacro()
        # check where
        self.checkWhere()
        # check stream
        self.checkStream()
    # stop
    def stop(self):
        tdSql.close()
        tdLog.success(f"{__file__} successfully executed")
 tdCases.addLinux(__file__, TDTestCase())
 tdCases.addWindows(__file__, TDTestCase())
--- a/tests/system-test/1-insert/precisionUS.py
+++ b/tests/system-test/1-insert/precisionUS.py
@ -0,0 +1,287 @@
 ###################################################################
 #           Copyright (c) 2016 by TAOS Technologies, Inc.
 #                     All rights reserved.
 #
 #  This file is proprietary and confidential to TAOS Technologies.
 #  No part of this file may be reproduced, stored, transmitted,
 #  disclosed or used in any form or by any means other than as
 #  expressly provided by the written permission from Jianhui Tao
 #
 ###################################################################
 # -*- coding: utf-8 -*-
 import sys
 import random
 import time
 import taos
 from util.log import *
 from util.cases import *
 from util.sql import *
 class TDTestCase:
    # get col value and total max min ...
    def getColsValue(self, i, j):
        # c1 value
        if random.randint(1, 10) == 5:
            c1 = None
        else:
            c1 = 1
        # c2 value
        if j % 3200 == 0:
            c2 = 8764231
        elif random.randint(1, 10) == 5:
            c2 = None
        else:
            c2 = random.randint(-87654297, 98765321)    
        value = f"({self.ts}, "
        # c1
        if c1 is None:
            value += "null,"
        else:
            self.c1Cnt += 1
            value += f"{c1},"
        # c2
        if c2 is None:
            value += "null,"
        else:
            value += f"{c2},"
            # total count
            self.c2Cnt += 1
            # max
            if self.c2Max is None:
                self.c2Max = c2
            else:
                if c2 > self.c2Max:
                    self.c2Max = c2
            # min
            if self.c2Min is None:
                self.c2Min = c2
            else:
                if c2 < self.c2Min:
                    self.c2Min = c2
            # sum
            if self.c2Sum is None:
                self.c2Sum = c2
            else:
                self.c2Sum += c2
        # c3 same with ts
        value += f"{self.ts})"
        # move next
        self.ts += 1
        return value
    # insert data
    def insertData(self):
        tdLog.info("insert data ....")
        sqls = ""
        for i in range(self.childCnt):
            # insert child table
            values = ""
            pre_insert = f"insert into t{i} values "
            for j in range(self.childRow):
                if values == "":
                    values = self.getColsValue(i, j)
                else:
                    values += "," + self.getColsValue(i, j)
                # batch insert    
                if j % self.batchSize == 0  and values != "":
                    sql = pre_insert + values
                    tdSql.execute(sql)
                    values = ""
            # append last
            if values != "":
                sql = pre_insert + values
                tdSql.execute(sql)
                values = ""
        sql = "flush database db;"
        tdLog.info(sql)
        tdSql.execute(sql)
        # insert finished
        tdLog.info(f"insert data successfully.\n"
        f"                            inserted child table = {self.childCnt}\n"
        f"                            inserted child rows  = {self.childRow}\n"
        f"                            total inserted rows  = {self.childCnt*self.childRow}\n")
        return
    # prepareEnv
    def prepareEnv(self):
        # init                
        self.ts = 1680000000000*1000
        self.childCnt = 5
        self.childRow = 10000
        self.batchSize = 5000
        # total
        self.c1Cnt = 0
        self.c2Cnt = 0
        self.c2Max = None
        self.c2Min = None
        self.c2Sum = None
        # create database  db
        sql = f"create database db vgroups 2 precision 'us' "
        tdLog.info(sql)
        tdSql.execute(sql)
        sql = f"use db"
        tdSql.execute(sql)
        # create super talbe st
        sql = f"create table st(ts timestamp, c1 int, c2 bigint, ts1 timestamp) tags(area int)"
        tdLog.info(sql)
        tdSql.execute(sql)
        # create child table
        for i in range(self.childCnt):
            sql = f"create table t{i} using st tags({i}) "
            tdSql.execute(sql)
        # create stream
        sql = "create stream ma into sta as select count(ts) from st interval(100u)"
        tdLog.info(sql)
        tdSql.execute(sql)
        # insert data
        self.insertData()
    # check data correct
    def checkExpect(self, sql, expectVal):
        tdSql.query(sql)
        rowCnt = tdSql.getRows()
        for i in range(rowCnt):
            val = tdSql.getData(i,0)
            if val != expectVal:
                tdLog.exit(f"Not expect . query={val} expect={expectVal} i={i} sql={sql}")
                return False
        tdLog.info(f"check expect ok. sql={sql} expect ={expectVal} rowCnt={rowCnt}")
        return True
    # check time macro
    def checkTimeMacro(self):
        # 2 week
        val = 2
        usval = val*7*24*60*60*1000*1000
        expectVal = self.childCnt * self.childRow
        sql = f"select count(ts) from st where timediff(ts - {val}w, ts1) = {usval} "
        self.checkExpect(sql, expectVal)
        # 20 day
        val = 20
        usval = val*24*60*60*1000*1000
        uint = "d"
        sql = f"select count(ts) from st where timediff(ts - {val}{uint}, ts1) = {usval} "
        self.checkExpect(sql, expectVal)
        # 30 hour
        val = 30
        usval = val*60*60*1000*1000
        uint = "h"
        sql = f"select count(ts) from st where timediff(ts - {val}{uint}, ts1) = {usval} "
        self.checkExpect(sql, expectVal)
        # 90 minutes
        val = 90
        usval = val*60*1000*1000
        uint = "m"
        sql = f"select count(ts) from st where timediff(ts - {val}{uint}, ts1) = {usval} "
        self.checkExpect(sql, expectVal)
        # 2s
        val = 2
        usval = val*1000*1000
        uint = "s"
        sql = f"select count(ts) from st where timediff(ts - {val}{uint}, ts1) = {usval} "
        self.checkExpect(sql, expectVal)
        # 20a
        val = 20
        usval = val*1000
        uint = "a"
        sql = f"select count(ts) from st where timediff(ts - {val}{uint}, ts1) = {usval} "
        self.checkExpect(sql, expectVal)
        # 300u
        val = 300
        usval = val*1
        uint = "u"
        sql = f"select count(ts) from st where timediff(ts - {val}{uint}, ts1) = {usval} "
        self.checkExpect(sql, expectVal)
    # init
    def init(self, conn, logSql, replicaVar=1):
        seed = time.clock_gettime(time.CLOCK_REALTIME)
        random.seed(seed)
        self.replicaVar = int(replicaVar)
        tdLog.debug(f"start to excute {__file__}")
        tdSql.init(conn.cursor(), True)
    # where
    def checkWhere(self):
        cnt = 300
        start = self.ts - cnt
        sql = f"select count(ts) from st where ts >= {start} and ts <= {self.ts}"
        self.checkExpect(sql, cnt)
        for i in range(50):
            cnt =  random.randint(1,40000)
            base = 2000
            start = self.ts - cnt - base
            end   = self.ts - base 
            sql = f"select count(ts) from st where ts >= {start} and ts < {end}"
            self.checkExpect(sql, cnt)
    # stream
    def checkStream(self):
        allRows = self.childCnt * self.childRow
        # ensure write data is expected
        sql = "select count(*) from (select diff(ts) as a from (select ts from st order by ts asc)) where a=1;"
        self.checkExpect(sql, allRows - 1)
        # stream count is ok
        sql =f"select count(*) from sta"
        cnt = int(allRows / 100) - 1 # last window is not close, so need reduce one
        self.checkExpect(sql, cnt)
        # check fields
        sql =f"select count(*) from sta where `count(ts)` != 100"
        self.checkExpect(sql, 0)
        # check timestamp
        sql =f"select count(*) from (select diff(`_wstart`) from sta)"
        self.checkExpect(sql, cnt - 1)
        sql =f"select count(*) from (select diff(`_wstart`) as a from sta) where a != 100"
        self.checkExpect(sql, 0)
    # run
    def run(self):
        # prepare env
        self.prepareEnv()
        # time macro like 1w 1d 1h 1m 1s 1a 1u
        self.checkTimeMacro()
        # check where
        self.checkWhere()
        # check stream
        self.checkStream()
    # stop
    def stop(self):
        tdSql.close()
        tdLog.success(f"{__file__} successfully executed")
 tdCases.addLinux(__file__, TDTestCase())
 tdCases.addWindows(__file__, TDTestCase())
--- a/tests/system-test/2-query/interp.py
+++ b/tests/system-test/2-query/interp.py
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@ -121,20 +121,20 @@ ELSE ()
            BUILD_COMMAND
            COMMAND set CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client
            COMMAND set CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib
-            COMMAND go build -a -o taosadapter.exe -ldflags "-X github.com/taosdata/taosadapter/v3/version.Version=${taos_version} -X github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}"
+            # COMMAND go build -a -o taosadapter.exe -ldflags "-X github.com/taosdata/taosadapter/v3/version.Version=${taos_version} -X github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}"
-#            COMMAND go build -a -o taosadapter.exe -ldflags "-s -w -X github.com/taosdata/taosadapter/v3/version.Version=${taos_version} -X github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}"
+            COMMAND go build -a -o taosadapter.exe -ldflags "-s -w -X github.com/taosdata/taosadapter/v3/version.Version=${taos_version} -X github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}"
-#            COMMAND go build -a -o taosadapter-debug.exe -ldflags "-X github.com/taosdata/taosadapter/v3/version.Version=${taos_version} -X github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}"
+            COMMAND go build -a -o taosadapter-debug.exe -ldflags "-X github.com/taosdata/taosadapter/v3/version.Version=${taos_version} -X github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}"
            INSTALL_COMMAND
-#            COMMAND cmake -E echo "Comparessing taosadapter.exe"
+            COMMAND cmake -E echo "Comparessing taosadapter.exe"
-#            COMMAND cmake -E time upx taosadapter.exe
+            COMMAND cmake -E time upx taosadapter.exe
            COMMAND cmake -E echo "Copy taosadapter.exe"
            COMMAND cmake -E copy taosadapter.exe ${CMAKE_BINARY_DIR}/build/bin/taosadapter.exe
            COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test/cfg/
            COMMAND cmake -E echo "Copy taosadapter.toml"
            COMMAND cmake -E copy ./example/config/taosadapter.toml ${CMAKE_BINARY_DIR}/test/cfg/
-#            COMMAND cmake -E echo "Copy taosadapter-debug.exe"
+            COMMAND cmake -E echo "Copy taosadapter-debug.exe"
-#            COMMAND cmake -E copy taosadapter-debug.exe ${CMAKE_BINARY_DIR}/build/bin
+            COMMAND cmake -E copy taosadapter-debug.exe ${CMAKE_BINARY_DIR}/build/bin
            )
    ELSE (TD_WINDOWS)
        MESSAGE("Building taosAdapter on non-Windows")
@ -149,20 +149,20 @@ ELSE ()
            PATCH_COMMAND
            COMMAND     git clean -f -d
            BUILD_COMMAND
-            COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build -a -ldflags "-X github.com/taosdata/taosadapter/v3/version.Version=${taos_version} -X github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}"
+            # COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build -a -ldflags "-X github.com/taosdata/taosadapter/v3/version.Version=${taos_version} -X github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}"
-#            COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build -a -ldflags "-s -w -X github.com/taosdata/taosadapter/v3/version.Version=${taos_version} -X github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}"
+            COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build -a -ldflags "-s -w -X github.com/taosdata/taosadapter/v3/version.Version=${taos_version} -X github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}"
-#            COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build -a -o taosadapter-debug -ldflags "-X github.com/taosdata/taosadapter/v3/version.Version=${taos_version} -X github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}"
+            COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build -a -o taosadapter-debug -ldflags "-X github.com/taosdata/taosadapter/v3/version.Version=${taos_version} -X github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}"
            INSTALL_COMMAND
-#            COMMAND cmake -E echo "Comparessing taosadapter.exe"
+            COMMAND cmake -E echo "Comparessing taosadapter.exe"
-#            COMMAND upx taosadapter || :
+            COMMAND upx taosadapter || :
            COMMAND cmake -E echo "Copy taosadapter"
            COMMAND cmake -E copy taosadapter ${CMAKE_BINARY_DIR}/build/bin
            COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test/cfg/
            COMMAND cmake -E echo "Copy taosadapter.toml"
            COMMAND cmake -E copy ./example/config/taosadapter.toml ${CMAKE_BINARY_DIR}/test/cfg/
            COMMAND cmake -E copy ./taosadapter.service ${CMAKE_BINARY_DIR}/test/cfg/
-#            COMMAND cmake -E echo "Copy taosadapter-debug"
+            COMMAND cmake -E echo "Copy taosadapter-debug"
-#            COMMAND cmake -E copy taosadapter-debug ${CMAKE_BINARY_DIR}/build/bin
+            COMMAND cmake -E copy taosadapter-debug ${CMAKE_BINARY_DIR}/build/bin
            )
    ENDIF (TD_WINDOWS)
 ENDIF ()
--- a/utils/test/c/CMakeLists.txt
+++ b/utils/test/c/CMakeLists.txt
@ -9,35 +9,35 @@ add_executable(get_db_name_test get_db_name_test.c)
 add_executable(tmq_offset tmqOffset.c)
 target_link_libraries(
    tmq_offset
-    PUBLIC taos_static
+    PUBLIC taos
    PUBLIC util
    PUBLIC common
    PUBLIC os
 )
 target_link_libraries(
    create_table
-    PUBLIC taos_static
+    PUBLIC taos
    PUBLIC util
    PUBLIC common
    PUBLIC os
 )
 target_link_libraries(
    tmq_demo
-    PUBLIC taos_static
+    PUBLIC taos
    PUBLIC util
    PUBLIC common
    PUBLIC os
 )
 target_link_libraries(
    tmq_sim
-    PUBLIC taos_static
+    PUBLIC taos
    PUBLIC util
    PUBLIC common
    PUBLIC os
 )
 target_link_libraries(
    tmq_taosx_ci
-    PUBLIC taos_static
+    PUBLIC taos
    PUBLIC util
    PUBLIC common
    PUBLIC os
@ -45,7 +45,7 @@ target_link_libraries(
 target_link_libraries(
    write_raw_block_test
-    PUBLIC taos_static
+    PUBLIC taos
    PUBLIC util
    PUBLIC common
    PUBLIC os
@ -53,7 +53,7 @@ target_link_libraries(
 target_link_libraries(
    sml_test
-    PUBLIC taos_static
+    PUBLIC taos
    PUBLIC util
    PUBLIC common
    PUBLIC os
@ -61,7 +61,7 @@ target_link_libraries(
 target_link_libraries(
    get_db_name_test
-    PUBLIC taos_static
+    PUBLIC taos
    PUBLIC util
    PUBLIC common
    PUBLIC os