taosdata · litongjava · Dec 18, 2023 · Dec 18, 2023 · Dec 19, 2023 · Dec 19, 2023
diff --git 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.2.2.0.alpha")
+  SET(TD_VER_NUMBER "3.2.3.0.alpha")
 ENDIF ()
 
 IF (DEFINED VERCOMPATIBLE)

diff --git a/cmake/curl_CMakeLists.txt.in b/cmake/curl_CMakeLists.txt.in
@@ -1,6 +1,7 @@
 # curl
 ExternalProject_Add(curl2
-        URL  https://curl.se/download/curl-8.2.1.tar.gz
+        URL  https://github.com/curl/curl/releases/download/curl-8_2_1/curl-8.2.1.tar.gz
+        #URL  https://curl.se/download/curl-8.2.1.tar.gz
         URL_HASH MD5=b25588a43556068be05e1624e0e74d41
         DOWNLOAD_NO_PROGRESS 1
         DOWNLOAD_DIR "${TD_CONTRIB_DIR}/deps-download"

diff --git a/docs/en/08-client-libraries/50-odbc.mdx b/docs/en/08-client-libraries/50-odbc.mdx
@@ -57,9 +57,9 @@ TDengine ODBC driver supports two kinds of connections to TDengine cluster, nati
 
     4.6 [Password]: optional field, only used for connection testing in step 5; 
 
-5. Click "Test Connecting" to test whether the data source can be connectted; if successful, it will prompt "connecting success"
+5. Click "Test Connection" to test whether the data source can be connectted; if successful, it will prompt "Successfully connected to URL"
 
-6. Click "OK" to sae the configuration and exit.
+6. Click "OK" to set the configuration and exit.
 
 7. You can also select an already configured data source name in step 2 to change existing configuration.
 

diff --git a/docs/en/08-client-libraries/assets/odbc-ws-config-en.webp b/docs/en/08-client-libraries/assets/odbc-ws-config-en.webp
diff --git a/docs/en/10-deployment/01-deploy.md b/docs/en/10-deployment/01-deploy.md
@@ -173,12 +173,6 @@ Query OK, 8 row(s) in set (0.001154s)
 
 Before running the TDengine CLI, ensure that the taosd process has been stopped on the dnode that you want to delete.
 
-```sql
-DROP DNODE "fqdn:port";
-```
-
-or
-
 ```sql
 DROP DNODE dnodeId;
 ```

diff --git a/docs/en/12-taos-sql/06-select.md b/docs/en/12-taos-sql/06-select.md
@@ -9,7 +9,7 @@ description: This document describes how to query data in TDengine.
 ```sql
 SELECT {DATABASE() | CLIENT_VERSION() | SERVER_VERSION() | SERVER_STATUS() | NOW() | TODAY() | TIMEZONE() | CURRENT_USER() | USER() }
 
-SELECT [hints] [DISTINCT] select_list
+SELECT [hints] [DISTINCT] [TAGS] select_list
     from_clause
     [WHERE condition]
     [partition_by_clause]
@@ -139,6 +139,11 @@ You can query tag columns in supertables and subtables and receive results in th
 SELECT location, groupid, current FROM d1001 LIMIT 2;
 ```
 
+### Alias Name
+
+The naming rules for aliases are the same as those for columns, and it supports directly specifying Chinese aliases in UTF-8 encoding format.
+
+
 ### Distinct Values
 
 The DISTINCT keyword returns only values that are different over one or more columns. You can use the DISTINCT keyword with tag columns and data columns.
@@ -182,7 +187,7 @@ The TBNAME pseudocolumn in a supertable contains the names of subtables within t
 The following SQL statement returns all unique subtable names and locations within the meters supertable:
 
 ```mysql
-SELECT DISTINCT TBNAME, location FROM meters;
+SELECT TAGS TBNAME, location FROM meters;
 ```
 
 Use the `INS_TAGS` system table in `INFORMATION_SCHEMA` to query the information for subtables in a supertable. For example, the following statement returns the name and tag values for each subtable in the `meters` supertable.
@@ -227,6 +232,14 @@ The \_IROWTS pseudocolumn can only be used with INTERP function. This pseudocolu
 select _irowts, interp(current) from meters range('2020-01-01 10:00:00', '2020-01-01 10:30:00') every(1s) fill(linear);
 ```
 
+### TAGS Query
+
+The TAGS keyword returns only tag columns from all child tables when only tag columns are specified. One row containing tag columns is returned for each child table.
+
+```sql
+SELECT TAGS tag_name [, tag_name ...] FROM stb_name
+```
+
 ## Query Objects
 
 `FROM` can be followed by a number of tables or super tables, or can be followed by a sub-query.
@@ -434,7 +447,8 @@ SELECT ... FROM (SELECT ... FROM ...) ...;
 
 :::info
 
-- The result of a nested query is returned as a virtual table used by the outer query. It's recommended to give an alias to this table for the convenience of using it in the outer query.
+- The result of a nested query is returned as a virtual table used by the outer query. It's recommended to give an alias to this table for the convenience of using it in the outer query.
+- Outer queries support directly referencing columns or pseudo-columns of inner queries in the form of column names or `column names`.
 - JOIN operation is allowed between tables/STables inside both inner and outer queries. Join operation can be performed on the result set of the inner query.
 - The features that can be used in the inner query are the same as those that can be used in a non-nested query.
   - `ORDER BY` inside the inner query is unnecessary and will slow down the query performance significantly. It is best to avoid the use of `ORDER BY` inside the inner query.

diff --git a/docs/en/12-taos-sql/21-node.md b/docs/en/12-taos-sql/21-node.md
@@ -27,10 +27,10 @@ The preceding SQL command shows all dnodes in the cluster with the ID, endpoint,
 ## Delete a DNODE
 
 ```sql
-DROP DNODE {dnode_id | dnode_endpoint}
+DROP DNODE dnode_id
 ```
 
-You can delete a dnode by its ID or by its endpoint. Note that deleting a dnode does not stop its process. You must stop the process after the dnode is deleted.
+Note that deleting a dnode does not stop its process. You must stop the process after the dnode is deleted.
 
 ## Modify Dnode Configuration
 

diff --git a/docs/en/12-taos-sql/26-udf.md b/docs/en/12-taos-sql/26-udf.md
@@ -53,7 +53,7 @@ CREATE AGGREGATE FUNCTION function_name AS library_path OUTPUTTYPE output_type [
   CREATE AGGREGATE FUNCTION l2norm AS "/home/taos/udf_example/libl2norm.so" OUTPUTTYPE DOUBLE bufsize 64;
   ``` 
 
-For more information about user-defined functions, see [User-Defined Functions](../../develop/udf).
+For more information about user-defined functions, see [User-Defined Functions](https://docs.tdengine.com/develop/udf/).
 
 ## Manage UDF
 

diff --git 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://t
 
 import Release from "/components/ReleaseV3";
 
+## 3.2.2.0
+
+<Release type="tdengine" version="3.2.2.0" />
+
 ## 3.2.1.0
 
 <Release type="tdengine" version="3.2.1.0" />

diff --git a/docs/zh/08-connector/14-java.mdx b/docs/zh/08-connector/14-java.mdx
@@ -16,6 +16,7 @@ import TabItem from '@theme/TabItem';
 
 - JDBC 原生连接：Java 应用在物理节点 1（pnode1）上使用 TSDBDriver 直接调用客户端驱动（libtaos.so 或 taos.dll）的 API 将写入和查询请求发送到位于物理节点 2（pnode2）上的 taosd 实例。
 - JDBC REST 连接：Java 应用通过 RestfulDriver 将 SQL 封装成一个 REST 请求，发送给物理节点 2 的 REST 服务器（taosAdapter），通过 REST 服务器请求 taosd 并返回结果。
+- JDBC WebSocket 连接 : 是JDBC REST 连接的一种扩展形式.JDBC Rest使用http协议,JDBC WebSocket使用WebSocket协议.使用JDBC WebSocket可以进行一些JDBC Rest不支持的操作
 
 使用 REST 连接，不依赖 TDengine 客户端驱动，可以跨平台，更加方便灵活。
 
@@ -1418,6 +1419,123 @@ public static void main(String[] args) throws Exception {
 
 > 更多 druid 使用问题请查看[官方说明](https://github.com/alibaba/druid)。
 
+### 使用连接池整合tio-boot框架
+#### tio-boot讲解
+tio-boot是一个高性能的网络框架,本章节是使用连接池和tio-boot框架整合来管理数据库连接的示例
+
+#### TDUtils 存储 DataSource
+```java
+package com.litongjava.tio.web.hello.config.utils;
+
+import javax.sql.DataSource;
+
+public class TDUtils {
+
+  public static DataSource ds;
+
+  public static void setDataSource(DataSource ds) {
+    TDUtils.ds = ds;
+  }
+}
+
+```
+- `TDUtils` 类用于全局存储和访问 `DataSource` 实例。
+- 通过 `setDataSource` 方法，可以设置一个 `DataSource` 实例，这通常是在应用启动时完成的。
+
+#### 创建配置类
+```java
+package com.litongjava.tio.web.hello.config;
+
+import com.litongjava.jfinal.aop.annotation.ABean;
+import com.litongjava.jfinal.aop.annotation.AConfiguration;
+import com.litongjava.tio.web.hello.config.utils.TDUtils;
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+
+import javax.sql.DataSource;
+
+@AConfiguration
+public class TdEngineDataSourceConfig {
+
+  @ABean(destroyMethod = "close", priority = 10)
+  public DataSource hikariDataSource() {
+    HikariConfig config = new HikariConfig();
+    // jdbc properties
+    String host = "192.168.3.9";
+    int port = 6041;
+    String user = "root";
+    String pswd = "taosdata";
+    String dbName = "test_ws_parabind";
+    String driverClassName = "com.taosdata.jdbc.rs.RestfulDriver";
+    // String driverClassName = "com.taosdata.jdbc.TSDBDriver";
+
+    String jdbcUrl = getJdbcUrl(host, port, user, pswd, dbName);
+    config.setJdbcUrl(jdbcUrl);
+    config.setDriverClassName(driverClassName);
+    // connection pool configurations
+    config.setMinimumIdle(10); // minimum number of idle connection
+    config.setMaximumPoolSize(10); // maximum number of connection in the pool
+    config.setConnectionTimeout(30000); // maximum wait milliseconds for get connection from pool
+    config.setMaxLifetime(0); // maximum life time for each connection
+    config.setIdleTimeout(0); // max idle time for recycle idle connection
+    config.setConnectionTestQuery("select server_status()"); // validation query
+
+    HikariDataSource ds = new HikariDataSource(config); // create datasource
+    TDUtils.setDataSource(ds);
+    return ds;
+  }
+
+  private String getJdbcUrl(String host, int port, String user, String pswd, String dbName) {
+    // 添加batchfetch=true属性后得到的Websocket连接
+    return "jdbc:TAOS-RS://" + host + ":" + port + "/" + dbName + "?user=" + user + "&password=" + pswd
+      + "&batchfetch=true";
+  }
+}
+```
+- 这是一个配置类，用于创建和配置 `HikariDataSource`。
+- 使用了 `HikariConfig` 来设置数据库连接的详细信息，如主机名、端口、用户、密码等。
+- 配置了连接池的参数，如最小空闲连接数、最大连接数、连接超时时间等。
+- `hikariDataSource` 方法创建了 `HikariDataSource` 的实例，并使用 `TDUtils.setDataSource` 方法存储它。
+
+#### 测试获取连接
+```java
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Timestamp;
+import java.util.List;
+import java.util.Random;
+
+import com.litongjava.jfinal.plugin.activerecord.Record;
+import com.litongjava.tio.http.server.annotation.RequestPath;
+import com.litongjava.tio.web.hello.config.utils.TDUtils;
+import com.taosdata.jdbc.ws.TSWSPreparedStatement;
+
+import lombok.Cleanup;
+
+@RequestPath("/tdeingien/test")
+public class TbEngineTestController {
+
+  public String connection() throws SQLException {
+    @Cleanup
+    Connection connection = TDUtils.ds.getConnection();
+    String string = connection.toString();
+    return string;
+  }
+}
+```
+- `TbEngineTestController` 类用于测试数据库连接。
+- `connection` 方法从 `TDUtils` 获取一个 `DataSource` 实例，然后从中获取一个连接，并将连接对象的字符串表示返回。
+- `@Cleanup` 用于在操作完成后自动关闭 Connection
+
+#### 完整的代码示例
+[示例1](https://github.com/litongjava/java-ee-tio-boot-study/tree/main/tio-boot-latest-study/tio-boot-jfinal-plugins-tdengine-study)
+[示例2](https://github.com/litongjava/java-ee-tio-boot-study/tree/main/tio-boot-latest-study/tio-boot-mybatis-plus-tdengine-study)
+
+
+
+
 ### 更多示例程序
 
 示例程序源码位于 `TDengine/examples/JDBC` 下:

diff --git a/docs/zh/08-connector/50-odbc.mdx b/docs/zh/08-connector/50-odbc.mdx
@@ -48,17 +48,17 @@ TDengine ODBC 支持两种连接 TDengine 数据库方式：Websocket 连接与
 
     4.1 【DSN】:Data Source Name 必填，为新添加的 ODBC 数据源命名
 
-    4.2【Connection Type】 : 必选，选择连接类型，这里选择 【Websocket】
+    4.2【连接类型】 : 必选，选择连接类型，这里选择 【Websocket】
 
-    4.3【URL】必填，ODBC 数据源 URL，example: `http://localhost:6041`， 云服务的 url 示例: `https://gw.cloud.taosdata.com?token=your_token`
+    4.3【URL】必填，ODBC 数据源 URL，示例: `http://localhost:6041`， 云服务的 url 示例: `https://gw.cloud.taosdata.com?token=your_token`
 
-    4.4【Database】选填，需要连接的默认数据库
+    4.4【数据库】选填，需要连接的默认数据库
 
-    4.5【User】仅供第5步测试连接使用，选填，数据库用户名，如果不填，TDengine 默认 root
+    4.5【用户名】仅供第5步测试连接使用，选填，数据库用户名，如果不填，TDengine 默认 root
 
-    4.6【Password】仅供第5步测试连接使用，选填，数据库用户密码，如果不填，TDengine 默认 taosdata
+    4.6【密码】仅供第5步测试连接使用，选填，数据库用户密码，如果不填，TDengine 默认 taosdata
 
-5. 点【Test Connecting...】测试连接情况，如果成功，提示"connecting success"
+5. 点【测试连接】测试连接情况，如果成功，提示"成功连接到URL"
 
 6. 点【确定】，即可保存配置并退出
 
@@ -78,17 +78,17 @@ TDengine ODBC 支持两种连接 TDengine 数据库方式：Websocket 连接与
 
     4.1 【DSN】:Data Source Name 必填，为新添加的 ODBC 数据源命名
 
-    4.2 【Connection Type】 : 必选，选择连接类型，这里选择 【Native】 原生连接；
+    4.2 【连接类型】 : 必选，选择连接类型，这里选择 【Native】 原生连接；
 
-    4.3 【Server】必填，ODBC 数据源 Server 地址，example: `localhost:6030`
+    4.3 【服务器】必填，ODBC 数据源 服务器 地址，示例: `localhost:6030`
 
-    4.4 【Database】选填，需要连接的默认数据库
+    4.4 【数据库】选填，需要连接的默认数据库
 
-    4.5 【User】仅供第5步测试连接使用，选填，数据库用户名，如果不填，TDengine 默认 root
+    4.5 【用户名】仅供第5步测试连接使用，选填，数据库用户名，如果不填，TDengine 默认 root
 
-    4.6 【Password】仅供第5步测试连接使用，选填，数据库用户密码，如果不填，TDengine 默认 taosdata
+    4.6 【密码】仅供第5步测试连接使用，选填，数据库用户密码，如果不填，TDengine 默认 taosdata
 
-5. 点【Test Connecting...】测试连接情况，如果成功，提示"connecting success"
+5. 点【测试连接】测试连接情况，如果成功，提示"连接成功"
 
 6. 点【确定】，即可保存配置并退出
 

diff --git a/docs/zh/08-connector/assets/odbc-native-config-zh.webp b/docs/zh/08-connector/assets/odbc-native-config-zh.webp
diff --git a/docs/zh/08-connector/assets/odbc-ws-config-zh.webp b/docs/zh/08-connector/assets/odbc-ws-config-zh.webp
diff --git a/docs/zh/10-deployment/01-deploy.md b/docs/zh/10-deployment/01-deploy.md
@@ -171,17 +171,11 @@ Query OK, 8 row(s) in set (0.001154s)
 
 启动 CLI 程序 taos，执行：
 
-```sql
-DROP DNODE "fqdn:port";
-```
-
-或者
-
 ```sql
 DROP DNODE dnodeId;
 ```
 
-通过 “fqdn:port” 或 dnodeID 来指定一个具体的节点都是可以的。其中 fqdn 是被删除的节点的 FQDN，port 是其对外服务器的端口号；dnodeID 可以通过 SHOW DNODES 获得。
+dnodeId 可以通过 SHOW DNODES 获得。
 
 :::warning
 

diff --git a/docs/zh/12-taos-sql/06-select.md b/docs/zh/12-taos-sql/06-select.md
@@ -9,7 +9,7 @@ description: 查询数据的详细语法
 ```sql
 SELECT {DATABASE() | CLIENT_VERSION() | SERVER_VERSION() | SERVER_STATUS() | NOW() | TODAY() | TIMEZONE() | CURRENT_USER() | USER() }
 
-SELECT [hints] [DISTINCT] select_list
+SELECT [hints] [DISTINCT] [TAGS] select_list
     from_clause
     [WHERE condition]
     [partition_by_clause]
@@ -139,6 +139,9 @@ SELECT d1001.* FROM d1001,d1003 WHERE d1001.ts = d1003.ts;
 SELECT location, groupid, current FROM d1001 LIMIT 2;
 ```
 
+### 别名
+别名的命名规则与列相同，支持直接指定 UTF-8 编码格式的中文别名。
+
 ### 结果去重
 
 `DISTINCT` 关键字可以对结果集中的一列或多列进行去重，去除的列既可以是标签列也可以是数据列。
@@ -162,6 +165,16 @@ SELECT DISTINCT col_name [, col_name ...] FROM tb_name;
 
 :::
 
+### 标签查询
+
+当查询的列只有标签列时，`TAGS` 关键字可以指定返回所有子表的标签列。每个子表只返回一行标签列。
+
+返回所有子表的标签列：
+
+```sql
+SELECT TAGS tag_name [, tag_name ...] FROM stb_name
+``` 
+
 ### 结果集列名
 
 `SELECT`子句中，如果不指定返回结果集合的列名，结果集列名称默认使用`SELECT`子句中的表达式名称作为列名称。此外，用户可使用`AS`来重命名返回结果集合中列的名称。例如：
@@ -182,7 +195,7 @@ taos> SELECT ts, ts AS primary_key_ts FROM d1001;
 获取一个超级表所有的子表名及相关的标签信息：
 
 ```mysql
-SELECT DISTINCT TBNAME, location FROM meters;
+SELECT TAGS TBNAME, location FROM meters;
 ```
 
 建议用户使用 INFORMATION_SCHEMA 下的 INS_TAGS 系统表来查询超级表的子表标签信息，例如获取超级表 meters 所有的子表名和标签值：
@@ -434,7 +447,8 @@ SELECT ... FROM (SELECT ... FROM ...) ...;
 
 :::info
 
-- 内层查询的返回结果将作为“虚拟表”供外层查询使用，此虚拟表建议起别名，以便于外层查询中方便引用。
+- 内层查询的返回结果将作为“虚拟表”供外层查询使用，此虚拟表建议起别名，以便于外层查询中方便引用。
+- 外层查询支持直接通过列名或`列名`的形式引用内层查询的列或伪列。
 - 在内层和外层查询中，都支持普通的表间/超级表间 JOIN。内层查询的计算结果也可以再参与数据子表的 JOIN 操作。
 - 内层查询支持的功能特性与非嵌套的查询语句能力是一致的。
   - 内层查询的 ORDER BY 子句一般没有意义，建议避免这样的写法以免无谓的资源消耗。

diff --git a/docs/zh/12-taos-sql/21-node.md b/docs/zh/12-taos-sql/21-node.md
@@ -27,10 +27,10 @@ SHOW DNODES;
 ## 删除数据节点
 
 ```sql
-DROP DNODE {dnode_id | dnode_endpoint}
+DROP DNODE dnode_id
 ```
 
-可以用 dnoe_id 或 endpoint 两种方式从集群中删除一个 dnode。注意删除 dnode 不等于停止相应的进程。实际中推荐先将一个 dnode 删除之后再停止其所对应的进程。
+注意删除 dnode 不等于停止相应的进程。实际中推荐先将一个 dnode 删除之后再停止其所对应的进程。
 
 ## 修改数据节点配置
-Original file line number
+Diff line change
@@ Expand Up / @@ -173,12 +173,6 @@ Query OK, 8 row(s) in set (0.001154s) @@
     Before running the TDengine CLI, ensure that the taosd process has been stopped on the dnode that you want to delete.
-    ```sql
-    DROP DNODE "fqdn:port";
-    ```
-    or
     ```sql
     DROP DNODE dnodeId;
     ```
@@ Expand Down @@