Merge branch 'develop' into docs/TD-16838-1

docs/en/07-develop/01-connect/index.md

@@ -98,11 +98,7 @@ pip install git+https://github.com/taosdata/taos-connector-python.git
 Just need to add `driver-go` dependency in `go.mod` .
 
 ```go-mod title=go.mod
-module goexample
-
-go 1.17
-
-require github.com/taosdata/driver-go/v2 develop
+{{#include docs/examples/go/go.mod}}
 ```
 
 :::note

docs/en/14-reference/03-connector/go.mdx

@@ -5,15 +5,15 @@ sidebar_label: Go
 title: TDengine Go Connector
 ---
 
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
+import Tabs from "@theme/Tabs";
+import TabItem from "@theme/TabItem";
 
-import Preparation from "./_preparation.mdx"
-import GoInsert from "../../07-develop/03-insert-data/_go_sql.mdx"
-import GoInfluxLine from "../../07-develop/03-insert-data/_go_line.mdx"
-import GoOpenTSDBTelnet from "../../07-develop/03-insert-data/_go_opts_telnet.mdx"
-import GoOpenTSDBJson from "../../07-develop/03-insert-data/_go_opts_json.mdx"
-import GoQuery from "../../07-develop/04-query-data/_go.mdx"
+import Preparation from "./_preparation.mdx";
+import GoInsert from "../../07-develop/03-insert-data/_go_sql.mdx";
+import GoInfluxLine from "../../07-develop/03-insert-data/_go_line.mdx";
+import GoOpenTSDBTelnet from "../../07-develop/03-insert-data/_go_opts_telnet.mdx";
+import GoOpenTSDBJson from "../../07-develop/03-insert-data/_go_opts_json.mdx";
+import GoQuery from "../../07-develop/04-query-data/_go.mdx";
 
 `driver-go` is the official Go language connector for TDengine. It implements the [database/sql](https://golang.org/pkg/database/sql/) package, the generic Go language interface to SQL databases. Go developers can use it to develop applications that access TDengine cluster data.
 
@@ -38,18 +38,18 @@ Please refer to [version support list](/reference/connector#version-support)
 
 A "native connection" is established by the connector directly to the TDengine instance via the TDengine client driver (taosc). The supported functional features are:
 
-* Normal queries
-* Continuous queries
-* Subscriptions
-* schemaless interface
-* parameter binding interface
+- Normal queries
+- Continuous queries
+- Subscriptions
+- schemaless interface
+- parameter binding interface
 
 ### REST connection
 
 A "REST connection" is a connection between the application and the TDengine instance via the REST API provided by the taosAdapter component. The following features are supported:
 
-* General queries
-* Continuous queries
+- General queries
+- Continuous queries
 
 ## Installation steps
 
@@ -60,44 +60,44 @@ A "REST connection" is a connection between the application and the TDengine ins
 
 Configure the environment variables and check the command.
 
-* `go env`
-* `gcc -v`
+- `go env`
+- `gcc -v`
 
 ### Use go get to install
 
 ```
-go get -u github.com/taosdata/driver-go/v2@develop
+go get -u github.com/taosdata/driver-go/v2@latest
 ```
 
 ### Manage with go mod
 
 1. Initialize the project with the `go mod` command.
 
-  ```text
-  go mod init taos-demo
-  ``` 
+```text
+go mod init taos-demo
+```
 
 2. Introduce taosSql
 
-  ```go
-  import (
-    "database/sql"
-    _ "github.com/taosdata/driver-go/v2/taosSql"
-  )
-  ```
+```go
+import (
+  "database/sql"
+  _ "github.com/taosdata/driver-go/v2/taosSql"
+)
+```
 
 3. Update the dependency packages with `go mod tidy`.
 
-  ```text
-  go mod tidy
-  ``` 
+```text
+go mod tidy
+```
 
 4. Run the program with `go run taos-demo` or compile the binary with the `go build` command.
 
-  ```text
-  go run taos-demo
-  go build
-  ```
+```text
+go run taos-demo
+go build
+```
 
 ## Create a connection
 
@@ -105,7 +105,7 @@ go get -u github.com/taosdata/driver-go/v2@develop
 
 Data source names have a standard format, e.g. [PEAR DB](http://pear.php.net/manual/en/package.database.db.intro-dsn.php), but no type prefix (square brackets indicate optionally):
 
-``` text
+```text
 [username[:password]@][protocol[(address)]]/[dbname][?param1=value1&... &paramN=valueN]
 ```
 
@@ -124,7 +124,7 @@ _taosSql_ implements Go's `database/sql/driver` interface via cgo. You can use t
 
 Use `taosSql` as `driverName` and use a correct [DSN](#DSN) as `dataSourceName`, DSN supports the following parameters.
 
-* configPath specifies the `taos.cfg` directory
+- configPath specifies the `taos.cfg` directory
 
 Example.
 
@@ -155,8 +155,8 @@ _taosRestful_ implements Go's `database/sql/driver` interface via `http client`.
 
 Use `taosRestful` as `driverName` and use a correct [DSN](#DSN) as `dataSourceName` with the following parameters supported by the DSN.
 
-* `disableCompression` whether to accept compressed data, default is true do not accept compressed data, set to false if transferring data using gzip compression.
-* `readBufferSize` The default size of the buffer for reading data is 4K (4096), which can be adjusted upwards when the query result has a lot of data.
+- `disableCompression` whether to accept compressed data, default is true do not accept compressed data, set to false if transferring data using gzip compression.
+- `readBufferSize` The default size of the buffer for reading data is 4K (4096), which can be adjusted upwards when the query result has a lot of data.
 
 Example.
 
@@ -179,6 +179,7 @@ func main() {
     }
 }
 ```
+
 </TabItem>
 </Tabs>
 
@@ -208,8 +209,8 @@ func main() {
 
 ### More sample programs
 
-* [sample program](https://github.com/taosdata/TDengine/tree/develop/examples/go)
-* [Video tutorial](https://www.taosdata.com/blog/2020/11/11/1951.html).
+- [sample program](https://github.com/taosdata/TDengine/tree/develop/examples/go)
+- [Video tutorial](https://www.taosdata.com/blog/2020/11/11/1951.html).
 
 ## Usage limitations
 
@@ -269,56 +270,52 @@ func main() {
 
 ## Frequently Asked Questions
 
-1. Cannot find the package `github.com/taosdata/driver-go/v2/taosRestful`
-
-  Change the `github.com/taosdata/driver-go/v2` line in the require block of the `go.mod` file to `github.com/taosdata/driver-go/v2 develop`, then execute `go mod tidy`.
-
-2. bind interface in database/sql crashes
+1. bind interface in database/sql crashes
 
-  REST does not support parameter binding related interface. It is recommended to use `db.Exec` and `db.Query`.
+   REST does not support parameter binding related interface. It is recommended to use `db.Exec` and `db.Query`.
 
-3. error `[0x217] Database not specified or available` after executing other statements with `use db` statement
+2. error `[0x217] Database not specified or available` after executing other statements with `use db` statement
 
-  The execution of SQL command in the REST interface is not contextual, so using `use db` statement will not work, see the usage restrictions section above.
+   The execution of SQL command in the REST interface is not contextual, so using `use db` statement will not work, see the usage restrictions section above.
 
-4. use `taosSql` without error but use `taosRestful` with error `[0x217] Database not specified or available`
+3. use `taosSql` without error but use `taosRestful` with error `[0x217] Database not specified or available`
 
-  Because the REST interface is stateless, using the `use db` statement will not take effect. See the usage restrictions section above.
+   Because the REST interface is stateless, using the `use db` statement will not take effect. See the usage restrictions section above.
 
-5. Upgrade `github.com/taosdata/driver-go/v2/taosRestful`
+4. Upgrade `github.com/taosdata/driver-go/v2/taosRestful`
 
-  Change the `github.com/taosdata/driver-go/v2` line in the `go.mod` file to `github.com/taosdata/driver-go/v2 develop`, then execute `go mod tidy`.
+   Change the `github.com/taosdata/driver-go/v2` line in the `go.mod` file to `github.com/taosdata/driver-go/v2 develop`, then execute `go mod tidy`.
 
-6. `readBufferSize` parameter has no significant effect after being increased
+5. `readBufferSize` parameter has no significant effect after being increased
 
-  Increasing `readBufferSize` will reduce the number of `syscall` calls when fetching results. If the query result is smaller, modifying this parameter will not improve performance significantly. If you increase the parameter value too much, the bottleneck will be parsing JSON data. If you need to optimize the query speed, you must adjust the value based on the actual situation to achieve the best query performance.
+   Increasing `readBufferSize` will reduce the number of `syscall` calls when fetching results. If the query result is smaller, modifying this parameter will not improve performance significantly. If you increase the parameter value too much, the bottleneck will be parsing JSON data. If you need to optimize the query speed, you must adjust the value based on the actual situation to achieve the best query performance.
 
-7. `disableCompression` parameter is set to `false` when the query efficiency is reduced
+6. `disableCompression` parameter is set to `false` when the query efficiency is reduced
 
-  When set `disableCompression` parameter to `false`, the query result will be compressed by `gzip` and then transmitted, so you have to decompress the data by `gzip` after getting it.
+   When set `disableCompression` parameter to `false`, the query result will be compressed by `gzip` and then transmitted, so you have to decompress the data by `gzip` after getting it.
 
-8. `go get` command can't get the package, or timeout to get the package
+7. `go get` command can't get the package, or timeout to get the package
 
-  Set Go proxy `go env -w GOPROXY=https://goproxy.cn,direct`.
+   Set Go proxy `go env -w GOPROXY=https://goproxy.cn,direct`.
 
 ## Common APIs
 
 ### database/sql API
 
-* `sql.Open(DRIVER_NAME string, dataSourceName string) *DB`
+- `sql.Open(DRIVER_NAME string, dataSourceName string) *DB`
 
   Use This API to open a DB, returning an object of type \*DB.
 
-:::info
-This API is created successfully without checking permissions, but only when you execute a Query or Exec, and check if user/password/host/port is legal.
+  :::info
+  This API is created successfully without checking permissions, but only when you execute a Query or Exec, and check if user/password/host/port is legal.
 
-:::
+  :::
 
-* `func (db *DB) Exec(query string, args . .interface{}) (Result, error)`
+- `func (db *DB) Exec(query string, args . .interface{}) (Result, error)`
 
   `sql.Open` built-in method to execute non-query related SQL.
 
-* `func (db *DB) Query(query string, args ... . interface{}) (*Rows, error)`
+- `func (db *DB) Query(query string, args ... . interface{}) (*Rows, error)`
 
   `sql.Open` Built-in method to execute query statements.
 
@@ -328,85 +325,85 @@ The `af` package encapsulates TDengine advanced functions such as connection man
 
 #### Connection management
 
-* `af.Open(host, user, pass, db string, port int) (*Connector, error)`
+- `af.Open(host, user, pass, db string, port int) (*Connector, error)`
 
   This API creates a connection to taosd via cgo.
 
-* `func (conn *Connector) Close() error`
+- `func (conn *Connector) Close() error`
 
   Closes the connection.
 
 #### Subscribe to
 
-* `func (conn *Connector) Subscribe(restart bool, topic string, sql string, interval time.Duration) (Subscriber, error)`
+- `func (conn *Connector) Subscribe(restart bool, topic string, sql string, interval time.Duration) (Subscriber, error)`
 
   Subscribe to data.
 
-* `func (s *taosSubscriber) Consume() (driver.Rows, error)`
+- `func (s *taosSubscriber) Consume() (driver.Rows, error)`
 
   Consume the subscription data, returning the `Rows` structure of the `database/sql/driver` package.
 
-* `func (s *taosSubscriber) Unsubscribe(keepProgress bool)`
+- `func (s *taosSubscriber) Unsubscribe(keepProgress bool)`
 
   Unsubscribe from data.
 
 #### schemaless
 
-* `func (conn *Connector) InfluxDBInsertLines(lines []string, precision string) error`
+- `func (conn *Connector) InfluxDBInsertLines(lines []string, precision string) error`
 
   Write to influxDB line protocol.
 
-* `func (conn *Connector) OpenTSDBInsertTelnetLines(lines []string) error`
+- `func (conn *Connector) OpenTSDBInsertTelnetLines(lines []string) error`
 
   Write OpenTDSB telnet protocol data.
 
-* `func (conn *Connector) OpenTSDBInsertJsonPayload(payload string) error`
+- `func (conn *Connector) OpenTSDBInsertJsonPayload(payload string) error`
 
   Writes OpenTSDB JSON protocol data.
 
 #### parameter binding
 
-* `func (conn *Connector) StmtExecute(sql string, params *param.Param) (res driver.Result, err error)`
+- `func (conn *Connector) StmtExecute(sql string, params *param.Param) (res driver.Result, err error)`
 
   Parameter bound single row insert.
 
-* `func (conn *Connector) StmtQuery(sql string, params *param.Param) (rows driver.Rows, err error)`
+- `func (conn *Connector) StmtQuery(sql string, params *param.Param) (rows driver.Rows, err error)`
 
   Parameter bound query that returns the `Rows` structure of the `database/sql/driver` package.
 
-* `func (conn *Connector) InsertStmt() *insertstmt.
+- `func (conn *Connector) InsertStmt() *insertstmt.
 
   Initialize the parameters.
 
-* `func (stmt *InsertStmt) Prepare(sql string) error`
+- `func (stmt *InsertStmt) Prepare(sql string) error`
 
   Parameter binding preprocessing SQL statement.
 
-* `func (stmt *InsertStmt) SetTableName(name string) error`
+- `func (stmt *InsertStmt) SetTableName(name string) error`
 
   Bind the set table name parameter.
 
-* `func (stmt *InsertStmt) SetSubTableName(name string) error`
+- `func (stmt *InsertStmt) SetSubTableName(name string) error`
 
   Parameter binding to set the sub table name.
 
-* `func (stmt *InsertStmt) BindParam(params []*param.Param, bindType *param.ColumnType) error`
+- `func (stmt *InsertStmt) BindParam(params []*param.Param, bindType *param.ColumnType) error`
 
   Parameter bind multiple rows of data.
 
-* `func (stmt *InsertStmt) AddBatch() error`
+- `func (stmt *InsertStmt) AddBatch() error`
 
   Add to a parameter-bound batch.
 
-* `func (stmt *InsertStmt) Execute() error`
+- `func (stmt *InsertStmt) Execute() error`
 
   Execute a parameter binding.
 
-* `func (stmt *InsertStmt) GetAffectedRows() int`
+- `func (stmt *InsertStmt) GetAffectedRows() int`
 
   Gets the number of affected rows inserted by the parameter binding.
 
-* `func (stmt *InsertStmt) Close() error`
+- `func (stmt *InsertStmt) Close() error`
 
   Closes the parameter binding.
 

docs/en/14-reference/04-taosadapter.md

@@ -206,8 +206,8 @@ Note: InfluxDB token authorization is not supported at present. Only Basic autho
 You can use any client that supports the http protocol to access the RESTful interface address `http://<fqdn>:6041/<APIEndPoint>` to write data in OpenTSDB compatible format to TDengine.
 
 ```text
-/opentsdb/v1/put/json/:db
-/opentsdb/v1/put/telnet/:db
+/opentsdb/v1/put/json/<db>
+/opentsdb/v1/put/telnet/<db>
 ```
 
 ### collectd

docs/examples/.gitignore

@@ -3,3 +3,4 @@
 .env
 *.~
 .idea
+

docs/examples/go/go.mod

@@ -2,5 +2,4 @@ module goexample
 
 go 1.17
 
-require github.com/taosdata/driver-go/v2 develop
-
+require github.com/taosdata/driver-go/v2 latest

docs/examples/java/src/main/java/com/taos/example/LineProtocolExample.java

@@ -26,7 +26,7 @@ public class LineProtocolExample {
 
     private static void createDatabase(Connection conn) throws SQLException {
         try (Statement stmt = conn.createStatement()) {
-            // the default precision is ms (microsecond), but we use us(microsecond) here.
+            // the default precision is ms (millisecond), but we use us(microsecond) here.
             stmt.execute("CREATE DATABASE IF NOT EXISTS test PRECISION 'us'");
             stmt.execute("USE test");
         }

docs/zh/07-develop/01-connect/index.md

@@ -99,11 +99,7 @@ pip install git+https://github.com/taosdata/taos-connector-python.git
 编辑 `go.mod` 添加 `driver-go` 依赖即可。
 
 ```go-mod title=go.mod
-module goexample
-
-go 1.17
-
-require github.com/taosdata/driver-go/v2 develop
+{{#include docs/examples/go/go.mod}}
 ```
 
 :::note

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

@@ -5,15 +5,15 @@ sidebar_label: Go
 title: TDengine Go Connector
 ---
 
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
+import Tabs from "@theme/Tabs";
+import TabItem from "@theme/TabItem";
 
-import Preparition from "./_preparition.mdx"
-import GoInsert from "../../07-develop/03-insert-data/_go_sql.mdx"
-import GoInfluxLine from "../../07-develop/03-insert-data/_go_line.mdx"
-import GoOpenTSDBTelnet from "../../07-develop/03-insert-data/_go_opts_telnet.mdx"
-import GoOpenTSDBJson from "../../07-develop/03-insert-data/_go_opts_json.mdx"
-import GoQuery from "../../07-develop/04-query-data/_go.mdx"
+import Preparition from "./_preparition.mdx";
+import GoInsert from "../../07-develop/03-insert-data/_go_sql.mdx";
+import GoInfluxLine from "../../07-develop/03-insert-data/_go_line.mdx";
+import GoOpenTSDBTelnet from "../../07-develop/03-insert-data/_go_opts_telnet.mdx";
+import GoOpenTSDBJson from "../../07-develop/03-insert-data/_go_opts_json.mdx";
+import GoQuery from "../../07-develop/04-query-data/_go.mdx";
 
 `driver-go` 是 TDengine 的官方 Go 语言连接器，实现了 Go 语言[ database/sql ](https://golang.org/pkg/database/sql/) 包的接口。Go 开发人员可以通过它开发存取 TDengine 集群数据的应用软件。
 
@@ -38,64 +38,64 @@ REST 连接支持所有能运行 Go 的平台。
 
 “原生连接”指连接器通过 TDengine 客户端驱动（taosc）直接与 TDengine 运行实例建立的连接。支持的功能特性有：
 
-* 普通查询
-* 连续查询
-* 订阅
-* schemaless 接口
-* 参数绑定接口
+- 普通查询
+- 连续查询
+- 订阅
+- schemaless 接口
+- 参数绑定接口
 
 ### REST 连接
 
 "REST 连接"指连接器通过 taosAdapter 组件提供的 REST API 与 TDengine 运行实例建立的连接。支持的功能特性有：
 
-* 普通查询
-* 连续查询
+- 普通查询
+- 连续查询
 
 ## 安装步骤
 
 ### 安装前准备
 
-* 安装 Go 开发环境（Go 1.14 及以上，GCC 4.8.5 及以上）
-* 如果使用原生连接器，请安装 TDengine 客户端驱动，具体步骤请参考[安装客户端驱动](/reference/connector#安装客户端驱动)
+- 安装 Go 开发环境（Go 1.14 及以上，GCC 4.8.5 及以上）
+- 如果使用原生连接器，请安装 TDengine 客户端驱动，具体步骤请参考[安装客户端驱动](/reference/connector#安装客户端驱动)
 
 配置好环境变量，检查命令：
 
-* ```go env```
-* ```gcc -v```
+- `go env`
+- `gcc -v`
 
 ### 使用 go get 安装
 
-`go get -u github.com/taosdata/driver-go/v2@develop`
+`go get -u github.com/taosdata/driver-go/v2@latest`
 
 ### 使用 go mod 管理
 
 1. 使用 `go mod` 命令初始化项目：
 
-  ```text
-  go mod init taos-demo
-  ```
+```text
+go mod init taos-demo
+```
 
 2. 引入 taosSql ：
 
-  ```go
-  import (
-    "database/sql"
-    _ "github.com/taosdata/driver-go/v2/taosSql"
-  )
-  ```
+```go
+import (
+  "database/sql"
+  _ "github.com/taosdata/driver-go/v2/taosSql"
+)
+```
 
 3. 使用 `go mod tidy` 更新依赖包：
 
-  ```text
-  go mod tidy
-  ```
+```text
+go mod tidy
+```
 
 4. 使用 `go run taos-demo` 运行程序或使用 `go build` 命令编译出二进制文件。
 
-  ```text
-  go run taos-demo
-  go build
-  ```
+```text
+go run taos-demo
+go build
+```
 
 ## 建立连接
 
@@ -103,7 +103,7 @@ REST 连接支持所有能运行 Go 的平台。
 
 数据源名称具有通用格式，例如 [PEAR DB](http://pear.php.net/manual/en/package.database.db.intro-dsn.php)，但没有类型前缀（方括号表示可选）：
 
-``` text
+```text
 [username[:password]@][protocol[(address)]]/[dbname][?param1=value1&...&paramN=valueN]
 ```
 
@@ -112,6 +112,7 @@ REST 连接支持所有能运行 Go 的平台。
 ```text
 username:password@protocol(address)/dbname?param=value
 ```
+
 ### 使用连接器进行连接
 
 <Tabs defaultValue="native">
@@ -121,7 +122,7 @@ _taosSql_ 通过 cgo 实现了 Go 的 `database/sql/driver` 接口。只需要
 
 使用 `taosSql` 作为 `driverName` 并且使用一个正确的 [DSN](#DSN) 作为 `dataSourceName`，DSN 支持的参数：
 
-* configPath 指定 taos.cfg 目录
+- configPath 指定 taos.cfg 目录
 
 示例：
 
@@ -152,8 +153,8 @@ _taosRestful_ 通过 `http client` 实现了 Go 的 `database/sql/driver` 接口
 
 使用 `taosRestful` 作为 `driverName` 并且使用一个正确的 [DSN](#DSN) 作为 `dataSourceName`，DSN 支持的参数：
 
-* `disableCompression` 是否接受压缩数据，默认为 true 不接受压缩数据，如果传输数据使用 gzip 压缩设置为 false。
-* `readBufferSize` 读取数据的缓存区大小默认为 4K（4096），当查询结果数据量多时可以适当调大该值。
+- `disableCompression` 是否接受压缩数据，默认为 true 不接受压缩数据，如果传输数据使用 gzip 压缩设置为 false。
+- `readBufferSize` 读取数据的缓存区大小默认为 4K（4096），当查询结果数据量多时可以适当调大该值。
 
 示例：
 
@@ -176,6 +177,7 @@ func main() {
     }
 }
 ```
+
 </TabItem>
 </Tabs>
 
@@ -205,8 +207,8 @@ func main() {
 
 ### 更多示例程序
 
-* [示例程序](https://github.com/taosdata/TDengine/tree/develop/examples/go)
-* [视频教程](https://www.taosdata.com/blog/2020/11/11/1951.html)。
+- [示例程序](https://github.com/taosdata/TDengine/tree/develop/examples/go)
+- [视频教程](https://www.taosdata.com/blog/2020/11/11/1951.html)。
 
 ## 使用限制
 
@@ -266,55 +268,51 @@ func main() {
 
 ## 常见问题
 
-1. 无法找到包 `github.com/taosdata/driver-go/v2/taosRestful`
-
-  将 `go.mod` 中 require 块对`github.com/taosdata/driver-go/v2`的引用改为`github.com/taosdata/driver-go/v2 develop`，之后执行 `go mod tidy`。
-
-2. database/sql 中 stmt（参数绑定）相关接口崩溃
+1. database/sql 中 stmt（参数绑定）相关接口崩溃
 
-  REST 不支持参数绑定相关接口，建议使用`db.Exec`和`db.Query`。
+   REST 不支持参数绑定相关接口，建议使用`db.Exec`和`db.Query`。
 
-3. 使用 `use db` 语句后执行其他语句报错 `[0x217] Database not specified or available`
+2. 使用 `use db` 语句后执行其他语句报错 `[0x217] Database not specified or available`
 
-  在 REST 接口中 SQL 语句的执行无上下文关联，使用 `use db` 语句不会生效，解决办法见上方使用限制章节。
+   在 REST 接口中 SQL 语句的执行无上下文关联，使用 `use db` 语句不会生效，解决办法见上方使用限制章节。
 
-4. 使用 taosSql 不报错使用 taosRestful 报错 `[0x217] Database not specified or available`
+3. 使用 taosSql 不报错使用 taosRestful 报错 `[0x217] Database not specified or available`
 
-  因为 REST 接口无状态，使用 `use db` 语句不会生效，解决办法见上方使用限制章节。
+   因为 REST 接口无状态，使用 `use db` 语句不会生效，解决办法见上方使用限制章节。
 
-5. 升级 `github.com/taosdata/driver-go/v2/taosRestful`
+4. 升级 `github.com/taosdata/driver-go/v2/taosRestful`
 
-  将 `go.mod` 文件中对 `github.com/taosdata/driver-go/v2` 的引用改为 `github.com/taosdata/driver-go/v2 develop`，之后执行 `go mod tidy`。
+   将 `go.mod` 文件中对 `github.com/taosdata/driver-go/v2` 的引用改为 `github.com/taosdata/driver-go/v2 develop`，之后执行 `go mod tidy`。
 
-6. `readBufferSize` 参数调大后无明显效果
+5. `readBufferSize` 参数调大后无明显效果
 
-  `readBufferSize` 调大后会减少获取结果时 `syscall` 的调用。如果查询结果的数据量不大，修改该参数不会带来明显提升，如果该参数修改过大，瓶颈会在解析 JSON 数据。如果需要优化查询速度，需要根据实际情况调整该值来达到查询效果最优。
+   `readBufferSize` 调大后会减少获取结果时 `syscall` 的调用。如果查询结果的数据量不大，修改该参数不会带来明显提升，如果该参数修改过大，瓶颈会在解析 JSON 数据。如果需要优化查询速度，需要根据实际情况调整该值来达到查询效果最优。
 
-7. `disableCompression` 参数设置为 `false` 时查询效率降低
+6. `disableCompression` 参数设置为 `false` 时查询效率降低
 
-  当 `disableCompression` 参数设置为 `false` 时查询结果会使用 `gzip` 压缩后传输，拿到数据后要先进行 `gzip` 解压。
+   当 `disableCompression` 参数设置为 `false` 时查询结果会使用 `gzip` 压缩后传输，拿到数据后要先进行 `gzip` 解压。
 
-8. `go get` 命令无法获取包，或者获取包超时
+7. `go get` 命令无法获取包，或者获取包超时
 
-  设置 Go 代理 `go env -w GOPROXY=https://goproxy.cn,direct`。
+   设置 Go 代理 `go env -w GOPROXY=https://goproxy.cn,direct`。
 
 ## 常用 API
 
 ### database/sql API
 
-* `sql.Open(DRIVER_NAME string, dataSourceName string) *DB`
+- `sql.Open(DRIVER_NAME string, dataSourceName string) *DB`
 
   该 API 用来打开 DB，返回一个类型为 \*DB 的对象。
 
-:::info
-该 API 成功创建的时候，并没有做权限等检查，只有在真正执行 Query 或者 Exec 的时候才能真正的去创建连接，并同时检查 user/password/host/port 是不是合法。
-:::
+  :::info
+  该 API 成功创建的时候，并没有做权限等检查，只有在真正执行 Query 或者 Exec 的时候才能真正的去创建连接，并同时检查 user/password/host/port 是不是合法。
+  :::
 
-* `func (db *DB) Exec(query string, args ...interface{}) (Result, error)`
+- `func (db *DB) Exec(query string, args ...interface{}) (Result, error)`
 
   `sql.Open` 内置的方法，用来执行非查询相关 SQL。
 
-* `func (db *DB) Query(query string, args ...interface{}) (*Rows, error)`
+- `func (db *DB) Query(query string, args ...interface{}) (*Rows, error)`
 
   `sql.Open` 内置的方法，用来执行查询语句。
 
@@ -324,85 +322,85 @@ func main() {
 
 #### 连接管理
 
-* `af.Open(host, user, pass, db string, port int) (*Connector, error)`
+- `af.Open(host, user, pass, db string, port int) (*Connector, error)`
 
   该 API 通过 cgo 创建与 taosd 的连接。
 
-* `func (conn *Connector) Close() error`
+- `func (conn *Connector) Close() error`
 
   关闭与 taosd 的连接。
 
 #### 订阅
 
-* `func (conn *Connector) Subscribe(restart bool, topic string, sql string, interval time.Duration) (Subscriber, error)`
+- `func (conn *Connector) Subscribe(restart bool, topic string, sql string, interval time.Duration) (Subscriber, error)`
 
   订阅数据。
 
-* `func (s *taosSubscriber) Consume() (driver.Rows, error)`
+- `func (s *taosSubscriber) Consume() (driver.Rows, error)`
 
   消费订阅数据，返回 `database/sql/driver` 包的 `Rows` 结构。
 
-* `func (s *taosSubscriber) Unsubscribe(keepProgress bool)`
+- `func (s *taosSubscriber) Unsubscribe(keepProgress bool)`
 
   取消订阅数据。
 
 #### schemaless
 
-* `func (conn *Connector) InfluxDBInsertLines(lines []string, precision string) error`
+- `func (conn *Connector) InfluxDBInsertLines(lines []string, precision string) error`
 
   写入 influxDB 行协议。
 
-* `func (conn *Connector) OpenTSDBInsertTelnetLines(lines []string) error`
+- `func (conn *Connector) OpenTSDBInsertTelnetLines(lines []string) error`
 
   写入 OpenTDSB telnet 协议数据。
 
-* `func (conn *Connector) OpenTSDBInsertJsonPayload(payload string) error`
+- `func (conn *Connector) OpenTSDBInsertJsonPayload(payload string) error`
 
   写入 OpenTSDB JSON 协议数据。
 
 #### 参数绑定
 
-* `func (conn *Connector) StmtExecute(sql string, params *param.Param) (res driver.Result, err error)`
+- `func (conn *Connector) StmtExecute(sql string, params *param.Param) (res driver.Result, err error)`
 
   参数绑定单行插入。
 
-* `func (conn *Connector) StmtQuery(sql string, params *param.Param) (rows driver.Rows, err error)`
+- `func (conn *Connector) StmtQuery(sql string, params *param.Param) (rows driver.Rows, err error)`
 
   参数绑定查询，返回 `database/sql/driver` 包的 `Rows` 结构。
 
-* `func (conn *Connector) InsertStmt() *insertstmt.InsertStmt`
+- `func (conn *Connector) InsertStmt() *insertstmt.InsertStmt`
 
   初始化参数。
 
-* `func (stmt *InsertStmt) Prepare(sql string) error`
+- `func (stmt *InsertStmt) Prepare(sql string) error`
 
   参数绑定预处理 SQL 语句。
 
-* `func (stmt *InsertStmt) SetTableName(name string) error`
+- `func (stmt *InsertStmt) SetTableName(name string) error`
 
   参数绑定设置表名。
 
-* `func (stmt *InsertStmt) SetSubTableName(name string) error`
+- `func (stmt *InsertStmt) SetSubTableName(name string) error`
 
   参数绑定设置子表名。
 
-* `func (stmt *InsertStmt) BindParam(params []*param.Param, bindType *param.ColumnType) error`
+- `func (stmt *InsertStmt) BindParam(params []*param.Param, bindType *param.ColumnType) error`
 
   参数绑定多行数据。
 
-* `func (stmt *InsertStmt) AddBatch() error`
+- `func (stmt *InsertStmt) AddBatch() error`
 
   添加到参数绑定批处理。
 
-* `func (stmt *InsertStmt) Execute() error`
+- `func (stmt *InsertStmt) Execute() error`
 
   执行参数绑定。
 
-* `func (stmt *InsertStmt) GetAffectedRows() int`
+- `func (stmt *InsertStmt) GetAffectedRows() int`
 
   获取参数绑定插入受影响行数。
 
-* `func (stmt *InsertStmt) Close() error`
+- `func (stmt *InsertStmt) Close() error`
 
   结束参数绑定。
 

docs/zh/14-reference/04-taosadapter.md

@@ -207,8 +207,8 @@ AllowWebSockets
 您可以使用任何支持 http 协议的客户端访问 Restful 接口地址 `http://<fqdn>:6041/<APIEndPoint>` 来写入 OpenTSDB 兼容格式的数据到 TDengine。EndPoint 如下：
 
 ```text
-/opentsdb/v1/put/json/:db
-/opentsdb/v1/put/telnet/:db
+/opentsdb/v1/put/json/<db>
+/opentsdb/v1/put/telnet/<db>
 ```
 
 ### collectd

packaging/release.sh

@@ -182,14 +182,10 @@ cd "${curr_dir}"
 # 2. cmake executable file
 compile_dir="${top_dir}/debug"
 if [ -d ${compile_dir} ]; then
-  ${csudo}rm -rf ${compile_dir}
+  rm -rf ${compile_dir}
 fi
 
-if [ "$osType" != "Darwin" ]; then
-  ${csudo}mkdir -p ${compile_dir}
-else
-  mkdir -p ${compile_dir}
-fi
+mkdir -p ${compile_dir}
 cd ${compile_dir}
 
 if [[ "$allocator" == "jemalloc" ]]; then
@@ -255,18 +251,18 @@ if [ "$osType" != "Darwin" ]; then
       echo "====do deb package for the ubuntu system===="
       output_dir="${top_dir}/debs"
       if [ -d ${output_dir} ]; then
-        ${csudo}rm -rf ${output_dir}
+        rm -rf ${output_dir}
       fi
-      ${csudo}mkdir -p ${output_dir}
+      mkdir -p ${output_dir}
       cd ${script_dir}/deb
       ${csudo}./makedeb.sh ${compile_dir} ${output_dir} ${verNumber} ${cpuType} ${osType} ${verMode} ${verType}
 
       if [[ "$pagMode" == "full" ]]; then
         if [ -d ${top_dir}/src/kit/taos-tools/packaging/deb ]; then
           cd ${top_dir}/src/kit/taos-tools/packaging/deb
+          taos_tools_ver=$(git describe --tags | sed -e 's/ver-//g' | awk -F '-' '{print $1}')
           [ -z "$taos_tools_ver" ] && taos_tools_ver="0.1.0"
 
-          taos_tools_ver=$(git describe --tags | sed -e 's/ver-//g' | awk -F '-' '{print $1}')
           ${csudo}./make-taos-tools-deb.sh ${top_dir} \
             ${compile_dir} ${output_dir} ${taos_tools_ver} ${cpuType} ${osType} ${verMode} ${verType}
         fi
@@ -280,18 +276,18 @@ if [ "$osType" != "Darwin" ]; then
       echo "====do rpm package for the centos system===="
       output_dir="${top_dir}/rpms"
       if [ -d ${output_dir} ]; then
-        ${csudo}rm -rf ${output_dir}
+        rm -rf ${output_dir}
       fi
-      ${csudo}mkdir -p ${output_dir}
+      mkdir -p ${output_dir}
       cd ${script_dir}/rpm
       ${csudo}./makerpm.sh ${compile_dir} ${output_dir} ${verNumber} ${cpuType} ${osType} ${verMode} ${verType}
 
       if [[ "$pagMode" == "full" ]]; then
         if [ -d ${top_dir}/src/kit/taos-tools/packaging/rpm ]; then
           cd ${top_dir}/src/kit/taos-tools/packaging/rpm
+          taos_tools_ver=$(git describe --tags | sed -e 's/ver-//g' | awk -F '-' '{print $1}' | sed -e 's/-/_/g')
           [ -z "$taos_tools_ver" ] && taos_tools_ver="0.1.0"
 
-          taos_tools_ver=$(git describe --tags | sed -e 's/ver-//g' | awk -F '-' '{print $1}' | sed -e 's/-/_/g')
           ${csudo}./make-taos-tools-rpm.sh ${top_dir} \
             ${compile_dir} ${output_dir} ${taos_tools_ver} ${cpuType} ${osType} ${verMode} ${verType}
         fi

taos-tools @ 5fdd6946

-Subproject commit a875a057d1225d85c6323b9edaccc2b1a9641987
+Subproject commit 5fdd694621fbb7bd2d6102ff4feaec92a7001038

tests/develop-test/5-taos-tools/taosbenchmark/insert_alltypes_json.py

@@ -93,8 +93,6 @@ class TDTestCase:
         tdSql.checkData(27, 1, "SMALLINT UNSIGNED")
         tdSql.checkData(28, 1, "BINARY")
         tdSql.checkData(28, 2, 19)
-        tdSql.query("select count(*) from db.stb where c0 >= 0 and c0 <= 10")
-        tdSql.checkData(0, 0, 160)
         tdSql.query("select count(*) from db.stb where c1 >= 0 and c1 <= 10")
         tdSql.checkData(0, 0, 160)
         tdSql.query("select count(*) from db.stb where c2 >= 0 and c2 <= 10")

tests/pytest/tools/taosdumpTestNanoSupport.py

@@ -61,7 +61,7 @@ class TDTestCase:
         def build_db(precision, start_time):
             tdSql.execute("drop database if exists timedb1")
             tdSql.execute(
-                "create database timedb1 days 10 keep 365 blocks 8 precision " +
+                "create database timedb1 days 10 keep 36500 blocks 8 precision " +
                 "\"" +
                 precision +
                 "\"")