merge: from main to 3.0 branch

docs/en/14-reference/05-connector/14-java.md

@@ -33,6 +33,7 @@ The JDBC driver implementation for TDengine strives to be consistent with relati
 
 | taos-jdbcdriver Version | Major Changes                                                                                                                                                                                                                                                                                                                                                                                               | TDengine Version   |
 | ----------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |
+| 3.7.3                   | Optimized WebSocket/Native query implementations.    |-|                                                                                                                                                                                                                                                                                                                                  | -                  |
 | 3.7.2                   | Fixed the supportsBatchUpdates issue that caused poor performance in Spring JdbcTemplate parameter binding.    |-|                                                                                                                                                                                                                                                                                                                                  | -                  |
 | 3.7.1                   | 1. Replace Java-WebSocket library with Netty to enhance small query performance. <br/>  2. Add IPv6 protocol compatibility. <br/>  3. Implement BLOB (Binary Large Object) data type support. <br/>  4. Enable TDengine version compatibility checks. <br/>  5. Support `varcharAsString` in connection property. <br/>  6. Optimize memory utilization in WebSocket query operations. <br/>  7. Fix timezone handling in WebSocket connections. <br/> |-|                                                                                                                                                                                                                                                                                                                                  | -                  |
 | 3.6.3                   | Fixed data type conversion bug in database or super table subscription.                                                                                                                                                                                                                                                                                                                                     | -                  |
@@ -239,15 +240,14 @@ All properties in **Properties** are supported in the JDBC URL. For details, ple
 
 **Note**: For native JDBC connections, taos-jdbcdriver depends on the client driver (libtaos.so on Linux; taos.dll on Windows; libtaos.dylib on macOS).
 
-The supported configuration parameters for native connection URLs are as follows:
+The supported common configuration parameters for native connection URLs are as follows:
 
 - user: TDengine username, default 'root'.
 - password: User login password, default 'taosdata'.
 - cfgdir: Client configuration file directory path, default `/etc/taos` on Linux OS, `C:/TDengine/cfg` on Windows OS.
 - charset: Character set used by the client, default is the system character set.
 - locale: Client language environment, default is the system current locale.
 - timezone: Client timezone, default is the system current timezone.
-- batchfetch: true: Fetch result sets in batches during query execution; false: Fetch result sets row by row. Default is true. Enabling batch fetching can effectively improve query performance when querying large data volumes.
 - batchErrorIgnore: true: Continue executing subsequent SQL statements if one fails during the execution of Statement's executeBatch. False: Do not execute any statements after a failed SQL. Default is false.
 
 Using TDengine Client Driver Configuration File to Establish Connection:
@@ -263,10 +263,10 @@ In TDengine, as long as one of the nodes in firstEp and secondEp is valid, a con
 Using JDBC WebSocket connection does not depend on the client driver. Here's an example: `jdbc:TAOS-WS://taosdemo.com:6030/power?user=root&password=taosdata&varcharAsString=true`. Compared to native JDBC connections, you only need to:
 
 1. Specify driverClass as "com.taosdata.jdbc.ws.WebSocketDriver";
-1. Start jdbcUrl with "jdbc:TAOS-WS://";
-1. Use 6041 as the connection port.
+2. Start jdbcUrl with "jdbc:TAOS-WS://";
+3. Use 6041 as the connection port.
 
-For WebSocket connections, the configuration parameters in the URL are as follows:
+For WebSocket connections, the common configuration parameters in the URL are as follows:
 
 - user: Login username for TDengine, default value 'root'.
 - password: User login password, default value 'taosdata'.
@@ -276,6 +276,7 @@ For WebSocket connections, the configuration parameters in the URL are as follow
 - useSSL: Whether SSL is used in the connection.
 - timezone: Client timezone, default is the system current timezone. Recommended not to set, using the system time zone provides better performance.
 - varcharAsString: Maps VARCHAR/BINARY types to String. Effective only when using WebSocket connections. Default value is false.
+- conmode: BI mode takes effect only when the WebSocket connection is established. The default value is 0, and it can be set to 1. Setting it to 1 means enabling BI mode, where metadata information does not count sub-tables. This is mainly used in scenarios when integration with BI tools.
 
 **Note**: Some configuration items (such as: locale, charset) do not take effect in WebSocket connections. WebSocket connections only support the UTF-8 character set.
 
@@ -291,7 +292,7 @@ Using JDBC REST connection does not depend on the client driver. Compared to nat
 2. Start jdbcUrl with "jdbc:TAOS-RS://";
 3. Use 6041 as the connection port.
 
-For REST connections, the configuration parameters in the URL are as follows:
+For REST connections, the common configuration parameters in the URL are as follows:
 
 - user: Login username for TDengine, default value 'root'.
 - password: User login password, default value 'taosdata'.
@@ -341,6 +342,8 @@ The configuration parameters in properties are as follows:
 - TSDBDriver.PROPERTY_KEY_RECONNECT_INTERVAL_MS [`reconnectIntervalMs`]: Auto-reconnect retry interval, in milliseconds, default value 2000. Effective only when PROPERTY_KEY_ENABLE_AUTO_RECONNECT is true.
 - TSDBDriver.PROPERTY_KEY_RECONNECT_RETRY_COUNT [`reconnectRetryCount`]: Auto-reconnect retry count, default value 3, effective only when PROPERTY_KEY_ENABLE_AUTO_RECONNECT is true.
 - TSDBDriver.PROPERTY_KEY_DISABLE_SSL_CERT_VALIDATION [`disableSSLCertValidation`]: Disable SSL certificate validation. Effective only when using WebSocket connections. true: enabled, false: not enabled. Default is false.
+
+- TSDBDriver.PROPERTY_KEY_CONNECT_MODE [`conmode`]: BI mode takes effect only when the WebSocket connection is established. The default value is 0, and it can be set to 1. Setting it to 1 means enabling BI mode, where metadata information does not count sub-tables. This is mainly used in scenarios when integration with BI tools.
 - TSDBDriver.PROPERTY_KEY_VARCHAR_AS_STRING [`varcharAsString`]: Maps VARCHAR/BINARY types to String. Effective only when using WebSocket connections. Default value is false.
 - TSDBDriver.PROPERTY_KEY_APP_NAME [`app_name`]: App name, can be used for display in the `show connections` query result. Effective only when using WebSocket connections. Default value is java.
 - TSDBDriver.PROPERTY_KEY_APP_IP [`app_ip`]: App IP, can be used for display in the `show connections` query result. Effective only when using WebSocket connections. Default value is empty.

docs/en/14-reference/09-error-code.md

@@ -253,6 +253,7 @@ This document details the server error codes that may be encountered when using
 | 0x8000040F | Snode already deployed | Already deployed                    | Confirm if correct  |
 | 0x80000410 | Snode not found        | Internal error                      | Report issue        |
 | 0x80000411 | Snode not deployed     | Already deployed                    | Confirm if correct  |
+| 0x8000042D | Request is not matched with local dnode | FQDN or port in taos.cfg is changed. | Change it back  |
 
 ## vnode
 
@@ -600,7 +601,6 @@ This document details the server error codes that may be encountered when using
 | 0x80006206 | Virtual table not support in Topic                      | Use virtual table in topic                                                                                                                                           | do not use virtual table in topic                                             |
 | 0x80006207 | Virtual super table query not support origin table from different databases                      | Virtual super table's child table's origin table from different databases                                                                               | make sure virtual super table's child table's origin table from same database |
 
-
 ## stream
 
 | Error Code | Description    | Possible Error Scenarios or Reasons   | Recommended Actions for Users     |

docs/examples/JDBC/JDBCDemo/pom.xml

@@ -19,7 +19,7 @@
         <dependency>
             <groupId>com.taosdata.jdbc</groupId>
             <artifactId>taos-jdbcdriver</artifactId>
-            <version>3.7.2</version>
+            <version>3.7.3</version>
         </dependency>
         <dependency>
             <groupId>org.locationtech.jts</groupId>

docs/examples/JDBC/SpringJdbcTemplate/pom.xml

@@ -47,7 +47,7 @@
         <dependency>
             <groupId>com.taosdata.jdbc</groupId>
             <artifactId>taos-jdbcdriver</artifactId>
-            <version>3.7.2</version>
+            <version>3.7.3</version>
         </dependency>
 
     </dependencies>

docs/examples/JDBC/connectionPools/pom.xml

@@ -18,7 +18,7 @@
         <dependency>
             <groupId>com.taosdata.jdbc</groupId>
             <artifactId>taos-jdbcdriver</artifactId>
-            <version>3.7.2</version>
+            <version>3.7.3</version>
         </dependency>
         <!-- druid -->
         <dependency>

docs/examples/JDBC/consumer-demo/pom.xml

@@ -17,7 +17,7 @@
         <dependency>
             <groupId>com.taosdata.jdbc</groupId>
             <artifactId>taos-jdbcdriver</artifactId>
-            <version>3.7.2</version>
+            <version>3.7.3</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>

docs/examples/JDBC/highvolume/pom.xml

@@ -19,7 +19,7 @@
         <dependency>
             <groupId>com.taosdata.jdbc</groupId>
             <artifactId>taos-jdbcdriver</artifactId>
-            <version>3.7.2</version>
+            <version>3.7.3</version>
         </dependency>
         <dependency>
             <groupId>commons-cli</groupId>

docs/examples/JDBC/mybatisplus-demo/pom.xml

@@ -83,7 +83,7 @@
         <dependency>
             <groupId>com.taosdata.jdbc</groupId>
             <artifactId>taos-jdbcdriver</artifactId>
-            <version>3.7.2</version>
+            <version>3.7.3</version>
         </dependency>
 
         <dependency>

docs/examples/JDBC/springbootdemo/pom.xml

@@ -112,7 +112,7 @@
         <dependency>
             <groupId>com.taosdata.jdbc</groupId>
             <artifactId>taos-jdbcdriver</artifactId>
-            <version>3.7.2</version>
+            <version>3.7.3</version>
         </dependency>
 
         <dependency>

docs/examples/JDBC/taosdemo/pom.xml

@@ -67,7 +67,7 @@
         <dependency>
             <groupId>com.taosdata.jdbc</groupId>
             <artifactId>taos-jdbcdriver</artifactId>
-            <version>3.7.2</version>
+            <version>3.7.3</version>
             <!--  <scope>system</scope>-->
             <!--  <systemPath>${project.basedir}/src/main/resources/lib/taos-jdbcdriver-2.0.15-dist.jar</systemPath>-->
         </dependency>

docs/examples/java/pom.xml

@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.taosdata.jdbc</groupId>
       <artifactId>taos-jdbcdriver</artifactId>
-      <version>3.7.2</version>
+      <version>3.7.3</version>
     </dependency>
     <!--    ANCHOR_END: dep-->
 

docs/zh/06-advanced/05-data-in/02-tmq.md

@@ -23,7 +23,7 @@ sidebar_label: "TDengine 数据订阅"
 
 对于 `数据库` 或 `超级表` 类型，如果需要同步表的增/删/改操作，则需要开启 `同步 Meta` 选项用于数据库/超级表的迁移，否则此主题只会进行数据同步。
 
-关于主题的创建，详情请参考 [数据订阅](../../14-reference/03-taos-sql/13-tmq.md) 章节。
+关于主题的创建，详情请参考 [数据订阅](../../14-reference/03-taos-sql/40-tmq.md) 章节。
 
 ### 第三步：复制主题的 DSN
 

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

@@ -89,7 +89,7 @@ TDengine TSDB 提供了丰富的应用程序开发接口，为了便于用户快
 <dependency>
   <groupId>com.taosdata.jdbc</groupId>
   <artifactId>taos-jdbcdriver</artifactId>
-  <version>3.7.2</version>
+  <version>3.7.3</version>
 </dependency>
 ```
 

docs/zh/14-reference/03-taos-sql/01-datatype.md

@@ -59,9 +59,9 @@ description: 'TDengine TSDB 支持的数据类型：时间戳、浮点型、JSON
 
 TDengine TSDB 缺省的时间戳精度是毫秒，但通过在 `CREATE DATABASE` 时传递的 `PRECISION` 参数也可以支持微秒和纳秒。
 
-```sql
-CREATE DATABASE db_name PRECISION 'ns';
-```
+    ```sql
+    CREATE DATABASE db_name PRECISION 'ns';
+    ```
 
 ## DECIMAL
 
@@ -90,6 +90,94 @@ DECIMAL 类型仅支持普通列，暂不支持 tag 列。DECIMAL 类型只支
 
 - 不支持虚拟表/流计算等功能
 
+## JSON
+
+### 语法说明
+
+1. 创建 json 类型 tag
+
+   ```sql
+   create stable s1 (ts timestamp, v1 int) tags (info json)
+
+   create table s1_1 using s1 tags ('{"k1": "v1"}')
+   ```
+
+2. json 取值操作符 ->
+
+   ```sql
+   select * from s1 where info->'k1' = 'v1'
+
+   select info->'k1' from s1
+   ```
+
+3. json key 是否存在操作符 contains
+
+   ```sql
+   select * from s1 where info contains 'k2'
+
+   select * from s1 where info contains 'k1'
+   ```
+
+### 支持的操作
+
+1. 在 where 条件中时，支持函数 `match`、`nmatch`、`between and`、`like`、`and`、`or`、`is null`、`is not null`，不支持 `in`
+
+   ```sql
+   select * from s1 where info->'k1' match 'v*';
+
+   select * from s1 where info->'k1' like 'v%' and info contains 'k2';
+
+   select * from s1 where info is null;
+
+   select * from s1 where info->'k1' is not null
+   ```
+
+2. 支持 json tag 放在 group by、order by、join 子句、union all 以及子查询中，比如 group by json->'key'
+
+3. 支持 distinct 操作
+
+   ```sql
+   select distinct info->'k1' from s1
+   ```
+
+4. 标签操作
+
+   支持修改 json 标签值（全量覆盖）
+
+   支持修改 json 标签名
+
+   不支持添加 json 标签、删除 json 标签、修改 json 标签列宽
+
+### 其他约束条件
+
+1. 只有标签列可以使用 json 类型，如果用 json 标签，标签列只能有一个。
+
+2. 长度限制：json 中 key 的长度不能超过 256，并且 key 必须为可打印 ascii 字符；json 字符串总长度不超过 4096 个字节。
+
+3. json 格式限制：
+
+   1. json 输入字符串可以为空（""、"\t"、" " 或 null）或 object，不能为非空的字符串，布尔型和数组。
+   2. object 可为 {}，如果 object 为 {}，则整个 json 串记为空。key 可为 ""，若 key 为 ""，则 json 串中忽略该 k-v 对。
+   3. value 可以为数字 (int/double) 或字符串或 bool 或 null，暂不可以为数组。不允许嵌套。
+   4. 若 json 字符串中出现两个相同的 key，则第一个生效。
+   5. json 字符串里暂不支持转义。
+
+4. 当查询 json 中不存在的 key 时，返回 NULL
+
+5. 当 json tag 作为子查询结果时，不再支持上层查询继续对子查询中的 json 串做解析查询。
+
+   比如暂不支持
+
+   ```sql
+   select jtag->'key' from (select jtag from stable)
+   ```
+
+   不支持
+
+   ```sql
+   select jtag->'key' from (select jtag from stable) where jtag->'key'>0
+   ```
+
 ## 常量
 
 TDengine TSDB 支持多个类型的常量，细节如下表：

docs/zh/14-reference/03-taos-sql/05-virtualtable.md

@@ -44,7 +44,7 @@ CREATE VTABLE [IF NOT EXISTS] [db_name].vtb_name
 
 **使用说明**
 
-1. 虚拟表（列）名命名规则参见 [名称命名规则](./19-limit.md#名称命名规则)。
+1. 虚拟表（列）名命名规则参见 [名称命名规则](./91-limit.md#名称命名规则)。
 2. 表名最大长度为 192。
 3. 表的第一个字段必须是 TIMESTAMP，并且系统自动将其设为主键。
 4. 表的每行长度不能超过 64KB（注意：每个 VARCHAR/NCHAR/GEOMETRY 类型的列还会额外占用 2 个字节的存储位置）。

docs/zh/14-reference/03-taos-sql/09-delete-data.mdx → docs/zh/14-reference/03-taos-sql/11-delete-data.md

@@ -1,7 +1,7 @@
 ---
-sidebar_label: 删除数据
-description: "删除指定表或超级表中的数据记录"
-title: "删除数据"
+sidebar_label: 数据删除
+description: 删除指定表或超级表中的数据记录
+title: 数据删除
 ---
 
 删除数据是 TDengine TSDB 提供的根据指定时间段删除指定表或超级表中数据记录的功能，方便用户清理由于设备故障等原因产生的异常数据。

docs/zh/14-reference/03-taos-sql/32-compress.md → docs/zh/14-reference/03-taos-sql/12-compress.md

@@ -1,7 +1,7 @@
 ---
-title: 可配置压缩算法
-sidebar_label: 可配置压缩
-description: 可配置压缩算法
+title: 数据压缩
+sidebar_label: 数据压缩
+description: 可配置的数据压缩算法
 ---
 
 从 v3.3.0.0 开始，TDengine TSDB 提供了更高级的压缩功能，用户可以在建表时针对每一列配置是否进行压缩、以及使用的压缩算法和压缩级别。
@@ -47,14 +47,14 @@ description: 可配置压缩算法
 CREATE [dbname.]tabname (colName colType [ENCODE 'encode_type'] [COMPRESS 'compress_type' [LEVEL 'level'], [, other create_definition]...])
 ```
 
-**参数说明**
+参数说明
 
 - tabname：超级表或者普通表名称
 - encode_type：一级压缩，具体参数见上面列表
 - compress_type：二级压缩，具体参数见上面列表
 - level：特指二级压缩的级别，默认值为 medium，支持简写为 'h'、'l'、'm'
 
-**功能说明**
+功能说明
 
 - 创建表的时候指定列的压缩方式
 
@@ -65,12 +65,12 @@ ALTER TABLE [db_name.]tabName MODIFY COLUMN colName [ENCODE 'ecode_type'] [COMPR
 
 ```
 
-**参数说明**
+参数说明
 
 - tabName：表名，可以为超级表、普通表
 - colName：待更改压缩算法的列，只能为普通列
 
-**功能说明**
+功能说明
 
 - 更改列的压缩方式
 
@@ -80,7 +80,7 @@ ALTER TABLE [db_name.]tabName MODIFY COLUMN colName [ENCODE 'ecode_type'] [COMPR
 DESCRIBE [dbname.]tabName
 ```
 
-**功能说明**
+功能说明
 
 - 显示列的基本信息，包括类型、压缩方式