Merge pull request #29563 from taosdata/main

Merge latest codes from main branch
taosdata · Jan 14, 2025 · 673887e · 673887e
2 parents d0c4cfa + 24fc9cf
commit 673887e
Show file tree

Hide file tree

Showing 160 changed files with 6,382 additions and 1,201 deletions.
diff --git a/.github/workflows/taosd-ci-build.yml b/.github/workflows/taosd-ci-build.yml
@@ -42,7 +42,7 @@ jobs:
           cmake .. -DBUILD_TOOLS=true \
             -DBUILD_KEEPER=true \
             -DBUILD_HTTP=false \
-            -DBUILD_TEST=false \
+            -DBUILD_TEST=true \
             -DBUILD_DEPENDENCY_TESTS=false
           make -j 4
           sudo make install

diff --git a/Jenkinsfile2 b/Jenkinsfile2
@@ -368,8 +368,8 @@ def pre_test_build_win() {
     '''
     bat '''
         cd %WIN_COMMUNITY_ROOT%/tests/ci
-        pip3 install taospy==2.7.16 
-        pip3 install taos-ws-py==0.3.5
+        pip3 install taospy==2.7.21 
+        pip3 install taos-ws-py==0.3.8
         xcopy /e/y/i/f %WIN_INTERNAL_ROOT%\\debug\\build\\lib\\taos.dll C:\\Windows\\System32
     '''
     return 1

diff --git a/README-CN.md b/README-CN.md
@@ -1,21 +1,14 @@
-<p>
 <p align="center">
-  <a href="https://tdengine.com" target="_blank">
+  <a href="https://www.taosdata.com" target="_blank">
   <img
     src="docs/assets/tdengine.svg"
     alt="TDengine"
     width="500"
   />
   </a>
 </p>
-<p>
 
-[![Build Status](https://travis-ci.org/taosdata/TDengine.svg?branch=master)](https://travis-ci.org/taosdata/TDengine)
-[![Build status](https://ci.appveyor.com/api/projects/status/kf3pwh2or5afsgl9/branch/master?svg=true)](https://ci.appveyor.com/project/sangshuduo/tdengine-2n8ge/branch/master)
-[![Coverage Status](https://coveralls.io/repos/github/taosdata/TDengine/badge.svg?branch=3.0)](https://coveralls.io/github/taosdata/TDengine?branch=3.0)
-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/4201/badge)](https://bestpractices.coreinfrastructure.org/projects/4201)
-
-简体中文 | [English](README.md) | [TDengine 云服务](https://cloud.taosdata.com/?utm_medium=cn&utm_source=github) | 很多职位正在热招中，请看[这里](https://www.taosdata.com/cn/careers/)
+简体中文 | [English](README.md) | [TDengine 云服务](https://cloud.taosdata.com/?utm_medium=cn&utm_source=github) | 很多职位正在热招中，请看[这里](https://www.taosdata.com/careers/)
 
 # TDengine 简介
 

diff --git a/docs/en/07-develop/05-stmt.md b/docs/en/07-develop/05-stmt.md
@@ -15,6 +15,19 @@ When inserting data using parameter binding, it can avoid the resource consumpti
 
 **Tips: It is recommended to use parameter binding for data insertion**
 
+   :::note
+   We only recommend using the following two forms of SQL for parameter binding data insertion:
+
+    ```sql
+    a. Subtables already exists:
+       1. INSERT INTO meters (tbname, ts, current, voltage, phase) VALUES(?, ?, ?, ?, ?) 
+    b. Automatic table creation on insert:
+       1. INSERT INTO meters (tbname, ts, current, voltage, phase, location, group_id) VALUES(?, ?, ?, ?, ?, ?, ?)   
+       2. INSERT INTO ? USING meters TAGS (?, ?) VALUES (?, ?, ?, ?)
+    ```
+
+   :::
+
 Next, we continue to use smart meters as an example to demonstrate the efficient writing functionality of parameter binding with various language connectors:
 
 1. Prepare a parameterized SQL insert statement for inserting data into the supertable `meters`. This statement allows dynamically specifying subtable names, tags, and column values.

diff --git a/docs/en/10-third-party/01-collection/flink.md b/docs/en/10-third-party/01-collection/flink.md
@@ -26,8 +26,8 @@ Flink Connector supports all platforms that can run Flink 1.19 and above version
 
 | Flink Connector Version | Major Changes | TDengine Version|
 |-------------------------| ------------------------------------ | ---------------- |
-| 2.0.0                   | 1.Support SQL queries on data in TDengine database <br/> 2. Support CDC subscription to data in TDengine database<br/> 3. Supports reading and writing to TDengine database using Table SQL | 3.3.5.0 and above versions|
-| 1.0.0                   | Support Sink function to write data from other sources to TDengine in the future| 3.3.2.0 and above versions|
+| 2.0.0                   | 1.Support SQL queries on data in TDengine database. <br/> 2. Support CDC subscription to data in TDengine database.<br/> 3. Supports reading and writing to TDengine database using Table SQL. | 3.3.5.0  and higher|
+| 1.0.0                   | Support Sink function to write data from other sources to TDengine in the future.| 3.3.2.0 and higher|
 
 ## Exception and error codes
 

diff --git a/docs/en/10-third-party/05-bi/11-superset.md b/docs/en/10-third-party/05-bi/11-superset.md
@@ -13,9 +13,9 @@ Through the Python connector of TDengine, Superset can support TDengine data sou
 
 Prepare the following environment:
 - TDengine is installed and running normally (both Enterprise and Community versions are available)
-- taosAdapter is running normally, refer to [taosAdapter](../../../reference/components/taosAdapter)
+- taosAdapter is running normally, refer to [taosAdapter](../../../tdengine-reference/components/taosadapter/)
 - Apache Superset version 2.1.0 or above is already installed, refre to [Apache Superset](https://superset.apache.org/)
- 
+
 ## Install TDengine Python Connector
 
 The Python connector of TDengine comes with a connection driver that supports Superset in versions 2.1.18 and later, which will be automatically installed in the Superset directory and provide data source services.  

diff --git a/docs/en/14-reference/01-components/01-taosd.md b/docs/en/14-reference/01-components/01-taosd.md
@@ -43,7 +43,7 @@ After modifying configuration file parameters, you need to restart the *taosd* s
 |resolveFQDNRetryTime   | Cancelled after 3.x      |Not supported                     |Number of retries when FQDN resolution fails|
 |timeToGetAvailableConn | Cancelled after 3.3.4.x  |Maximum waiting time to get an available connection, range 10-50000000, in milliseconds, default value 500000|
 |maxShellConns          | Cancelled after 3.x      |Supported, effective after restart|Maximum number of connections allowed|
-|maxRetryWaitTime       |                         |Supported, effective after restart|Maximum timeout for reconnection, default value is 10s|
+|maxRetryWaitTime       |                         |Supported, effective after restart|Maximum timeout for reconnection,calculated from the time of retry,range is 0-86400000,in milliseconds, default value 10000|
 |shareConnLimit         |Added in 3.3.4.0          |Supported, effective after restart|Number of requests a connection can share, range 1-512, default value 10|
 |readTimeout            |Added in 3.3.4.0          |Supported, effective after restart|Minimum timeout for a single request, range 64-604800, in seconds, default value 900|
 

diff --git a/docs/en/14-reference/01-components/03-taosadapter.md b/docs/en/14-reference/01-components/03-taosadapter.md
@@ -268,7 +268,22 @@ An exporter used by Prometheus that exposes hardware and operating system metric
 
 ### Getting the VGroup ID of a table
 
-You can access the HTTP interface `http://<fqdn>:6041/rest/vgid?db=<db>&table=<table>` to get the VGroup ID of a table.
+You can send a POST request to the HTTP interface `http://<fqdn>:<port>/rest/sql/<db>/vgid` to get the VGroup ID of a table. 
+The body should be a JSON array of multiple table names. 
+
+Example: Get the VGroup ID for the database power and tables d_bind_1 and d_bind_2.
+
+```shell
+curl --location 'http://127.0.0.1:6041/rest/sql/power/vgid' \
+--user 'root:taosdata' \
+--data '["d_bind_1","d_bind_2"]'
+```
+
+response:
+
+```json
+{"code":0,"vgIDs":[153,152]}
+```
 
 ## Memory Usage Optimization Methods
 

diff --git a/docs/en/14-reference/03-taos-sql/06-select.md b/docs/en/14-reference/03-taos-sql/06-select.md
@@ -491,15 +491,15 @@ SELECT ... FROM (SELECT ... FROM ...) ...;
 
 :::
 
-## UNION ALL Clause
+## UNION Clause
 
 ```text title=Syntax
 SELECT ...
-UNION ALL SELECT ...
-[UNION ALL SELECT ...]
+UNION [ALL] SELECT ...
+[UNION [ALL] SELECT ...]
 ```
 
-TDengine supports the UNION ALL operator. This means that if multiple SELECT clauses return result sets with the exact same structure (column names, column types, number of columns, order), these result sets can be combined together using UNION ALL. Currently, only the UNION ALL mode is supported, which means that duplicates are not removed during the merging process. In the same SQL statement, a maximum of 100 UNION ALLs are supported.
+TDengine supports the UNION [ALL] operator. This means that if multiple SELECT clauses return result sets with the exact same structure (column names, column types, number of columns, order), these result sets can be combined together using UNION [ALL].
 
 ## SQL Examples
 

diff --git a/docs/en/14-reference/03-taos-sql/21-node.md b/docs/en/14-reference/03-taos-sql/21-node.md
@@ -45,7 +45,7 @@ ALTER ALL DNODES dnode_option
 
 For configuration parameters that support dynamic modification, you can use the ALTER DNODE or ALTER ALL DNODES syntax to modify the values of configuration parameters in a dnode. Starting from version 3.3.4.0, the modified configuration parameters will be automatically persisted and will remain effective even after the database service is restarted.
 
-To check whether a configuration parameter supports dynamic modification, please refer to the following page: [taosd Reference](../01-components/01-taosd.md)
+To check whether a configuration parameter supports dynamic modification, please refer to the following page: [taosd Reference](/tdengine-reference/components/taosd/)
 
 The value is the parameter's value and needs to be in character format. For example, to change the log output level of dnode 1 to debug:
 
@@ -130,7 +130,7 @@ ALTER LOCAL local_option
 
 You can use the above syntax to modify the client's configuration parameters, and there is no need to restart the client. The changes take effect immediately.
 
-To check whether a configuration parameter supports dynamic modification, please refer to the following page:[taosc Reference](../01-components/02-taosc.md)
+To check whether a configuration parameter supports dynamic modification, please refer to the following page:[taosc Reference](/tdengine-reference/components/taosc/)
 
 
 ## View Client Configuration

diff --git a/docs/en/14-reference/03-taos-sql/27-udf.md b/docs/en/14-reference/03-taos-sql/27-udf.md
@@ -60,7 +60,7 @@ CREATE [OR REPLACE] AGGREGATE FUNCTION function_name AS library_path OUTPUTTYPE
   CREATE AGGREGATE FUNCTION l2norm AS "/home/taos/udf_example/libl2norm.so" OUTPUTTYPE DOUBLE bufsize 64;
   ```
 
-About how to develop custom functions, please refer to [UDF Usage Instructions](../../../developer-guide/user-defined-functions/).
+About how to develop custom functions, please refer to [UDF Usage Instructions](/developer-guide/user-defined-functions/).
 
 ## Manage UDF
 

diff --git a/docs/en/14-reference/03-taos-sql/28-tsma.md b/docs/en/14-reference/03-taos-sql/28-tsma.md
@@ -4,7 +4,11 @@ title: Time-Range Small Materialized Aggregates (TSMAs)
 slug: /tdengine-reference/sql-manual/manage-tsmas
 ---
 
-To improve the performance of aggregate function queries with large data volumes, window pre-aggregation (TSMA Time-Range Small Materialized Aggregates) objects are created. By using fixed time windows to pre-calculate specified aggregate functions and storing the results, query performance is enhanced by querying these pre-calculated results.
+In scenarios with large amounts of data, it is often necessary to query summary results for a certain period. As historical data increases or the time range expands, query time will also increase accordingly. By using materialized aggregation, the calculation results can be stored in advance, allowing subsequent queries to directly read the aggregated results without scanning the original data, such as the SMA (Small Materialized Aggregates) information within the current block.
+
+The SMA information within a block has a small granularity. If the query time range is in days, months, or even years, the number of blocks will be large. Therefore, TSMA (Time-Range Small Materialized Aggregates) supports users to specify a time window for materialized aggregation. By pre-calculating the data within a fixed time window and storing the calculation results, queries can be performed on the pre-calculated results to improve query performance.
+
+![TSMA Introduction](./assets/TSMA_intro.png)
 
 ## Creating TSMA
 

diff --git a/docs/en/14-reference/03-taos-sql/assets/TSMA_intro.png b/docs/en/14-reference/03-taos-sql/assets/TSMA_intro.png
diff --git a/docs/en/14-reference/05-connector/10-cpp.md b/docs/en/14-reference/05-connector/10-cpp.md
@@ -509,8 +509,8 @@ For the OpenTSDB text protocol, the parsing of timestamps follows its official p
   - **Interface Description**: Used for polling to consume data. Each consumer can only call this interface in a single thread.
     - tmq: [Input] Points to a valid ws_tmq_t structure pointer, which represents a TMQ consumer object.
     - timeout: [Input] Polling timeout in milliseconds, a negative number indicates a default timeout of 1 second.
-  - **Return Value**: Non-`NULL`: Success, returns a pointer to a WS_RES structure, which contains the received message. `NULL`: Failure, indicates no data. WS_RES results are consistent with taos_query results, and information in WS_RES can be obtained through various query interfaces, such as schema, etc.
-
+  - **Return Value**: Non-`NULL`: Success, returns a pointer to a WS_RES structure, which contains the received message. `NULL`: indicates no data, the error code can be obtained through ws_errno (NULL), please refer to the reference manual for specific error message. WS_RES results are consistent with taos_query results, and information in WS_RES can be obtained through various query interfaces, such as schema, etc.
+  
 - `int32_t ws_tmq_consumer_close(ws_tmq_t *tmq)`
   - **Interface Description**: Used to close the ws_tmq_t structure. Must be used in conjunction with ws_tmq_consumer_new.
     - tmq: [Input] Points to a valid ws_tmq_t structure pointer, which represents a TMQ consumer object.
@@ -1195,8 +1195,8 @@ In addition to using SQL or parameter binding APIs to insert data, you can also
   - **Interface Description**: Used to poll for consuming data, each consumer can only call this interface in a single thread.
     - tmq: [Input] Points to a valid tmq_t structure pointer, representing a TMQ consumer object.
     - timeout: [Input] Polling timeout in milliseconds, a negative number indicates a default timeout of 1 second.
-  - **Return Value**: Non-`NULL`: Success, returns a pointer to a TAOS_RES structure containing the received messages. `NULL`: Failure, indicates no data. TAOS_RES results are consistent with taos_query results, and information in TAOS_RES can be obtained through various query interfaces, such as schema, etc.
-
+  - **Return Value**: Non-`NULL`: Success, returns a pointer to a TAOS_RES structure containing the received messages. `NULL`: indicates no data, the error code can be obtained through taos_errno (NULL), please refer to the reference manual for specific error message. TAOS_RES results are consistent with taos_query results, and information in TAOS_RES can be obtained through various query interfaces, such as schema, etc.
+  
 - `int32_t tmq_consumer_close(tmq_t *tmq)`
   - **Interface Description**: Used to close a tmq_t structure. Must be used in conjunction with tmq_consumer_new.
     - tmq: [Input] Points to a valid tmq_t structure pointer, which represents a TMQ consumer object.

diff --git a/docs/en/14-reference/05-connector/30-python.md b/docs/en/14-reference/05-connector/30-python.md
@@ -50,7 +50,7 @@ Supports Python 3.0 and above.
 -The platforms supported by native connections are consistent with those supported by the TDengine client driver.
 -WebSocket/REST connections support all platforms that can run Python.
 
-## Versions History
+## Version History
 
 Python Connector historical versions (it is recommended to use the latest version of 'taopsy'):
 

diff --git a/docs/en/14-reference/05-connector/40-csharp.md b/docs/en/14-reference/05-connector/40-csharp.md
@@ -23,13 +23,14 @@ import RequestId from "../../assets/resources/_request_id.mdx";
 
 ## Version History
 
-| Connector Version | Major Changes                                     | TDengine Version   |
-|------------------|-------------------------------------------------|-------------------|
-| 3.1.4             | Improved WebSocket query and insert performance. | 3.3.2.0 and higher |
-| 3.1.3             | Supported WebSocket auto-reconnect.              | -                  |
-| 3.1.2             | Fixed schemaless resource release.               | -                  |
-| 3.1.1             | Supported varbinary and geometry types.          | -                  |
-| 3.1.0             | WebSocket uses a native C# implementation.       | 3.2.1.0 and higher |
+| Connector Version | Major Changes                                              | TDengine Version   |
+|-------------------|------------------------------------------------------------|--------------------|
+| 3.1.5             | Fix WebSocket encoding error for Chinese character length. | -                  |
+| 3.1.4             | Improved WebSocket query and insert performance.           | 3.3.2.0 and higher |
+| 3.1.3             | Supported WebSocket auto-reconnect.                        | -                  |
+| 3.1.2             | Fixed schemaless resource release.                         | -                  |
+| 3.1.1             | Supported varbinary and geometry types.                    | -                  |
+| 3.1.0             | WebSocket uses a native C# implementation.                 | 3.2.1.0 and higher |
 
 ## Exceptions and Error Codes
 

diff --git a/docs/en/14-reference/05-connector/50-odbc.md b/docs/en/14-reference/05-connector/50-odbc.md
@@ -124,7 +124,7 @@ In addition to this, the WebSocket connection method also supports 32-bit applic
 |      v1.1.0   | 1. Supports view functionality. <br/>2. Supports VARBINARY/GEOMETRY data types. <br/>3. Supports ODBC 32-bit WebSocket connection method (Enterprise edition only). <br/>4. Supports ODBC data source configuration dialog settings for compatibility adaptation options for industrial software like KingSCADA, Kepware, etc. (Enterprise edition only). | 3.3.3.0 and higher |
 |      v1.0.2   | Supports CP1252 character encoding.                                                                                 | 3.2.3.0 and higher |
 |      v1.0.1   | 1. Supports DSN settings for BI mode, in BI mode TDengine database does not return system database and supertable subtable information. <br/>2. Refactored character set conversion module, improving read and write performance. <br/> 3. Default connection method in ODBC data source configuration dialog changed to "WebSocket". <br/>4. Added "Test Connection" control in ODBC data source configuration dialog. <br/>5. ODBC data source configuration supports Chinese/English interface. |         -          |
-|    v1.0.0.0   | Initial release, supports interacting with Tdengine database to read and write data, refer to the "API Reference" section for details.                                | 3.2.2.0 and higher |
+|    v1.0.0.0   | Initial release, supports interacting with TDengine database to read and write data, refer to the "API Reference" section for details.                                | 3.2.2.0 and higher |
 
 ## Data Type Mapping
 

diff --git a/docs/en/14-reference/05-connector/60-rest-api.md b/docs/en/14-reference/05-connector/60-rest-api.md
@@ -252,7 +252,7 @@ Description:
 - code: (`int`) 0 represents success.
 - column_meta: (`[][3]any`) Column information, each column is described by three values: column name (string), column type (string), and type length (int).
 - rows: (`int`) Number of data return rows.
-- data: (`[][]any`) Specific data content (time format only supports RFC3339, result set for timezone 0).
+- data: (`[][]any`) Specific data content (time format only supports RFC3339, result set for timezone 0, when specifying tz, the corresponding time zone is returned).
 
 Column types use the following strings:
 
@@ -434,7 +434,6 @@ curl http://<fqnd>:<port>/rest/login/<username>/<password>
 
 Here, `fqdn` is the FQDN or IP address of the TDengine database, `port` is the port number of the TDengine service, `username` is the database username, and `password` is the database password. The return is in JSON format, with the fields meaning as follows:
 
-- status: Flag of the request result.
 - code: Return code.
 - desc: Authorization code.
 

diff --git a/docs/en/14-reference/09-error-code.md b/docs/en/14-reference/09-error-code.md
@@ -534,4 +534,5 @@ This document details the server error codes that may be encountered when using
 | 0x80004000 | Invalid message       | The subscribed data is illegal, generally does not occur     | Check the client-side error logs for details |
 | 0x80004001 | Consumer mismatch     | The vnode requested for subscription and the reassigned vnode are inconsistent, usually occurs when new consumers join the same consumer group | Internal error, not exposed to users         |
 | 0x80004002 | Consumer closed       | The consumer no longer exists                                | Check if it has already been closed          |
+| 0x80004017 | Invalid status, please subscribe topic first | tmq status invalidate | Without calling subscribe, directly poll data |
 | 0x80004100 | Stream task not exist | The stream computing task does not exist                     | Check the server-side error logs             |
diff --git a/docs/en/28-releases/01-tdengine.md b/docs/en/28-releases/01-tdengine.md
@@ -25,6 +25,10 @@ Download links for TDengine 3.x version installation packages are as follows:
 
 import Release from "/components/ReleaseV3";
 
+## 3.3.5.0
+
+<Release type="tdengine" version="3.3.5.0" />
+
 ## 3.3.4.8
 
 <Release type="tdengine" version="3.3.4.8" />

diff --git a/docs/en/28-releases/03-notes/3.3.4.8.md b/docs/en/28-releases/03-notes/3.3.4.8.md
@@ -2,7 +2,7 @@
 title: TDengine 3.3.4.8 Release Notes
 sidebar_label: 3.3.4.8
 description: Version 3.3.4.8 Notes
-slug: /release-history/release-notes/3.3.4.8
+slug: /release-history/release-notes/3-3-4-8
 ---
 
 ## New Features