mereg: from main to 3.0 branch

.github/workflows/new-framework-test.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - '3.0'
       - 'main'
+      - '3.3.6'
     paths-ignore:
       - 'packaging/**'
       - 'docs/**'

.github/workflows/tdengine-docs-ci.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - 'main'
       - '3.0'
+      - '3.3.6'
       - 'docs-cloud'
     paths:
       - 'docs/**'
@@ -58,7 +59,7 @@ jobs:
         with:
           args: --lint docs/zh/* docs/en/*
       - name: Report ReviewDog
-        if: always()
+        if: failure() && steps.autocorrect.conclusion == 'failure'
         uses: tomchon/autocorrect-action@fix/review-dog
         env:
           REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/tdengine-test.yml

@@ -48,8 +48,8 @@ env:
 jobs:
   run-tests-on-linux:
     # NOTE: using tomchon-patch-3 branch for the moment
-    #uses: taosdata/.github/.github/workflows/run-tests-on-linux.yml@main
-    uses: taosdata/.github/.github/workflows/run-tests-on-linux.yml@enh/remove-return-tests
+    uses: taosdata/.github/.github/workflows/run-tests-on-linux.yml@main
+    #uses: taosdata/.github/.github/workflows/run-tests-on-linux.yml@enh/remove-return-tests
     with:
       tdinternal: false
       specified_source_branch: ${{ github.event_name == 'pull_request' && 'unavailable' || inputs.specified_source_branch }}

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

@@ -145,7 +145,7 @@ If you are using Maven to manage your project, simply add the following dependen
     - Install a specific version
 
     ```shell
-    pip3 install taospy==2.8.2
+    pip3 install taospy==2.8.3
     ```
 
     - Install from GitHub
@@ -471,29 +471,17 @@ Additional parameters supported for WebSocket connections:
 
 <TabItem label="C" value="c">
 
-WebSocket Connection:
+The C/C++ connector uses the `taos_connect()` function to establish a connection with the TDengine database. The parameters are explained below:
 
-For C/C++ language connectors, the WebSocket connection uses the `ws_connect()` function to establish a connection with the TDengine database. Its parameter is a DSN description string, structured as follows:
+- `host`: The hostname or IP address of the database server. If it is a local database, you can use `"localhost"`.
+- `user`: Database login username.
+- `passwd`: The login password corresponding to the username.
+- `db`: The default database name used when connecting. If you do not specify a database, you can pass `NULL` or an empty string.
+- `port`: The port number that the database server listens on. The default port for native connections is `6030`, and the default port for WebSocket connections is `6041`.
 
-```text
-<driver>[+<protocol>]://[[<username>:<password>@]<host>:<port>][/<database>][?<p1>=<v1>[&<p2>=<v2>]]
-|------|------------|---|-----------|-----------|------|------|------------|-----------------------|
-|driver|   protocol |   | username  | password  | host | port |  database  |  params               |
-```
-
-For detailed explanation of DSN and how to use it, see [Connection Features](../../tdengine-reference/client-libraries/cpp/#dsn)
-
-Native Connection:
-
-For C/C++ language connectors, the native connection method uses the `taos_connect()` function to establish a connection with the TDengine database. Detailed parameters are as follows:
-
-- `host`: Hostname or IP address of the database server to connect to. If it is a local database, `"localhost"` can be used.
-- `user`: Username for logging into the database.
-- `passwd`: Password corresponding to the username.
-- `db`: Default database name when connecting. If no database is specified, pass `NULL` or an empty string.
-- `port`: Port number the database server listens on. The default port number is `6030`.
+For WebSocket connections, you need to call `taos_options(TSDB_OPTION_DRIVER, "websocket")` to set the driver type first, and then call `taos_connect()` to establish a connection.
 
-The `taos_connect_auth()` function is also provided for establishing a connection with the TDengine database using an MD5 encrypted password. This function is similar to `taos_connect`, but differs in the handling of the password, as `taos_connect_auth` requires the MD5 encrypted string of the password.
+Native connections also provide the `taos_connect_auth()` function, which is used to establish a connection using an MD5 encrypted password. This function has the same functionality as `taos_connect()`, the difference is how the password is handled. `taos_connect_auth()` requires the MD5 encrypted string of the password.
 
 </TabItem>
 
@@ -563,7 +551,7 @@ Below are code examples for establishing WebSocket connections in various langua
 <TabItem label="C" value="c">
 
 ```c
-{{#include docs/examples/c-ws/connect_example.c}}
+{{#include docs/examples/c-ws-new/connect_example.c}}
 ```
 
 </TabItem>

docs/en/07-develop/02-sql.md

@@ -71,7 +71,7 @@ Next, create a supertable (STABLE) named `meters`, whose table structure include
 <TabItem label="C" value="c">
 
 ```c  title="WebSocket Connection"
-{{#include docs/examples/c-ws/create_db_demo.c:create_db_and_table}}
+{{#include docs/examples/c-ws-new/create_db_demo.c:create_db_and_table}}
 ```
 
 ```c  title="Native Connection"
@@ -153,7 +153,7 @@ NOW is an internal system function, defaulting to the current time of the client
 <TabItem label="C" value="c">
 
 ```c title="WebSocket Connection"
-{{#include docs/examples/c-ws/insert_data_demo.c:insert_data}}
+{{#include docs/examples/c-ws-new/insert_data_demo.c:insert_data}}
 ```
 
 ```c title="Native Connection"
@@ -235,7 +235,7 @@ Rust connector also supports using **serde** for deserializing to get structured
 <TabItem label="C" value="c">
 
 ```c  title="WebSocket Connection"
-{{#include docs/examples/c-ws/query_data_demo.c:query_data}}
+{{#include docs/examples/c-ws-new/query_data_demo.c:query_data}}
 ```
 
 ```c  title="Native Connection"
@@ -316,11 +316,11 @@ Below are code examples of setting reqId to execute SQL in various language conn
 </TabItem>
 <TabItem label="C" value="c">
 
-```c "WebSocket Connection"
-{{#include docs/examples/c-ws/with_reqid_demo.c:with_reqid}}
+```c title="WebSocket Connection"
+{{#include docs/examples/c-ws-new/with_reqid_demo.c:with_reqid}}
 ```
 
-```c "Native Connection"
+```c title="Native Connection"
 {{#include docs/examples/c/with_reqid_demo.c:with_reqid}}
 ```
 

docs/en/07-develop/04-schemaless.md

@@ -241,7 +241,7 @@ writer.write(lineDemo, SchemalessProtocolType.LINE, SchemalessTimestampType.NANO
 <TabItem label="C" value="c">
 
 ```c
-{{#include docs/examples/c-ws/sml_insert_demo.c:schemaless}}
+{{#include docs/examples/c-ws-new/sml_insert_demo.c:schemaless}}
 ```
 
 </TabItem>

docs/en/07-develop/05-stmt.md

@@ -95,8 +95,10 @@ The example code for stmt to bind parameters is as follows:
 ```
 </TabItem>
 <TabItem label="C" value="c">
+The example code for binding parameters with stmt2 (TDengine v3.3.5.0 or higher is required) is as follows:
+
 ```c
-{{#include docs/examples/c-ws/stmt_insert_demo.c}}
+{{#include docs/examples/c-ws-new/stmt2_insert_demo.c}}
 ```
 </TabItem>
 <TabItem label="REST API" value="rest">
@@ -161,12 +163,17 @@ The example code for binding parameters with stmt2 (TDengine v3.3.5.0 or higher
 {{#include docs/examples/c/stmt2_insert_demo.c}}
 ```
 
-The example code for binding parameters with stmt is as follows:
+The example code for binding parameters with stmt is as follows (TDengine v3.3.5.0 has stopped maintenance):
+
+<details>
+<summary>Click to view stmt example code</summary>
 
 ```c
 {{#include docs/examples/c/stmt_insert_demo.c}}
 ```
 
+</details>
+
 </TabItem>
 <TabItem label="REST API" value="rest">
 Not supported

docs/en/07-develop/07-tmq.md

@@ -160,11 +160,11 @@ Introduces how connectors in various languages use WebSocket connection method t
 </TabItem>
 <TabItem label="C" value="c">
 ```c
-{{#include docs/examples/c-ws/tmq_demo.c:create_consumer_1}}
+{{#include docs/examples/c-ws-new/tmq_demo.c:create_consumer_1}}
 ```
 
 ```c
-{{#include docs/examples/c-ws/tmq_demo.c:create_consumer_2}}
+{{#include docs/examples/c-ws-new/tmq_demo.c:create_consumer_2}}
 ```
 
 Call the `build_consumer` function to attempt to obtain the consumer instance `tmq`. Print a success log if successful, and a failure log if not.
@@ -301,28 +301,28 @@ After subscribing to a topic, consumers can start receiving and processing messa
 </TabItem>
 <TabItem label="C" value="c">
 ```c
-{{#include docs/examples/c-ws/tmq_demo.c:build_topic_list}}
+{{#include docs/examples/c-ws-new/tmq_demo.c:build_topic_list}}
 ```
 
 ```c
-{{#include docs/examples/c-ws/tmq_demo.c:basic_consume_loop}}
+{{#include docs/examples/c-ws-new/tmq_demo.c:basic_consume_loop}}
 ```
 
 ```c
-{{#include docs/examples/c-ws/tmq_demo.c:msg_process}}
+{{#include docs/examples/c-ws-new/tmq_demo.c:msg_process}}
 ```
 
 ```c
-{{#include docs/examples/c-ws/tmq_demo.c:subscribe_3}}
+{{#include docs/examples/c-ws-new/tmq_demo.c:subscribe_3}}
 ```
 
 Steps for subscribing and consuming data:
 
-  1. Call the `ws_build_topic_list` function to create a topic list `topic_list`.
-  1. If `topic_list` is `NULL`, it means creation failed, and the function returns `-1`.
-  1. Use the `ws_tmq_subscribe` function to subscribe to the topic list specified by `tmq`. If the subscription fails, print an error message.
-  1. Destroy the topic list `topic_list` to free resources.
-  1. Call the `basic_consume_loop` function to start the basic consumption loop, processing the subscribed messages.
+  1. Call the `build_topic_list` function to create a topic list `topic_list`.
+  2. If `topic_list` is `NULL`, it means creation failed, and the function returns `-1`.
+  3. Use the `tmq_subscribe` function to subscribe to the topic list specified by `tmq`. If the subscription fails, print an error message.
+  4. Destroy the topic list `topic_list` to free resources.
+  5. Call the `basic_consume_loop` function to start the basic consumption loop, processing the subscribed messages.
 
 </TabItem>
 <TabItem label="REST API" value="rest">
@@ -476,15 +476,15 @@ Record this information.
 </TabItem>
 <TabItem label="C" value="c">
 ```c
-{{#include docs/examples/c-ws/tmq_demo.c:consume_repeatly}}
+{{#include docs/examples/c-ws-new/tmq_demo.c:consume_repeatly}}
 ```
 
-1. Use the `ws_tmq_get_topic_assignment` function to obtain the assignment information for a specific topic, including the number of assignments and the details of each assignment.
-1. If fetching the assignment information fails, print an error message and return.
-1. For each assignment, use the `ws_tmq_offset_seek` function to set the consumer's offset to the earliest offset.
-1. If setting the offset fails, print an error message.
-1. Release the assignment information array to free resources.
-1. Call the `basic_consume_loop` function to start a new consumption loop and process messages.
+1. Use the `tmq_get_topic_assignment` function to obtain the assignment information for a specific topic, including the number of assignments and the details of each assignment.
+2. If fetching the assignment information fails, print an error message and return.
+3. For each assignment, use the `tmq_offset_seek` function to set the consumer's offset to the earliest offset.
+4. If setting the offset fails, print an error message.
+5. Release the assignment information array to free resources.
+6. Call the `basic_consume_loop` function to start a new consumption loop and process messages.
 
 </TabItem>
 <TabItem label="REST API" value="rest">
@@ -617,10 +617,10 @@ You can manually submit the consumption progress using the `consumer.commit` met
 </TabItem>
 <TabItem label="C" value="c">
 ```c
-{{#include docs/examples/c-ws/tmq_demo.c:manual_commit}}
+{{#include docs/examples/c-ws-new/tmq_demo.c:manual_commit}}
 ```
 
-You can manually submit the consumption progress using the `ws_tmq_commit_sync` function.
+You can manually submit the consumption progress using the `tmq_commit_sync` function.
 
 </TabItem>
 <TabItem label="REST API" value="rest">
@@ -737,7 +737,7 @@ Consumers can unsubscribe from topics and stop receiving messages. When a consum
 </TabItem>
 <TabItem label="C" value="c">
 ```c
-{{#include docs/examples/c-ws/tmq_demo.c:unsubscribe_and_close}}
+{{#include docs/examples/c-ws-new/tmq_demo.c:unsubscribe_and_close}}
 ```
 </TabItem>
 <TabItem label="REST API" value="rest">
@@ -862,7 +862,7 @@ Not supported
 <details>
 <summary>Complete code example</summary>
 ```c
-{{#include docs/examples/c-ws/tmq_demo.c}}
+{{#include docs/examples/c-ws-new/tmq_demo.c}}
 ```
 </details>
 

docs/en/14-reference/01-components/01-taosd.md

@@ -102,7 +102,7 @@ timezone GMT-8
 timezone Asia/Shanghai
 ```
 
-All are valid settings for the GMT+8 time zone. However, note that on Windows, the format `timezone Asia/Shanghai` is not supported, and must be written as `timezone UTC-8`.
+All are valid settings for the GMT+8 time zone. However, note that on Windows, the format `timezone UTC-8` is not supported, and must be written as `timezone Asia/Shanghai`.
 
 The setting of the time zone affects the querying and writing of SQL statements involving non-Unix timestamp content (timestamp strings, interpretation of the keyword now). For example:
 

docs/en/14-reference/02-tools/10-taosbenchmark.md

@@ -500,6 +500,7 @@ For the following parameters, see the description of [Subscription](../../../adv
 | 17  |  GEOMETRY          |    geometry
 | 18  |  JSON              |    json
 | 19  |  DECIMAL           |    decimal
+| 20  |  BLOB              |    blob 
 
 Note: Data types in the taosBenchmark configuration file must be in lowercase to be recognized.
 

docs/en/14-reference/03-taos-sql/01-data-type.md

@@ -43,7 +43,8 @@ In TDengine, the following data types can be used in the data model of basic tab
 | 16   |      VARCHAR      | Custom    | Alias for BINARY type                                        |
 | 17   |     GEOMETRY      | Custom    | Geometry type, supported starting from version 3.1.0.0       |
 | 18   |     VARBINARY     | Custom    | Variable-length binary data, supported starting from version 3.1.1.0 |
-| 19  |      DECIMAL      |  8 or 16  | High-precision numeric type. The range of values depends on the precision and scale specified in the type. Supported starting from version 3.3.6. See the description below. |
+| 19   |      DECIMAL      | 8 or 16   | High-precision numeric type. The range of values depends on the precision and scale specified in the type. Supported starting from version 3.3.6. See the description below. |
+| 20   |      BLOB         | 4M        | Variable-length binary data, supported starting from version 3.3.7.0 |
 
 :::note
 
@@ -61,6 +62,7 @@ In TDengine, the following data types can be used in the data model of basic tab
 - In SQL statements, the type of numerical values will be determined based on the presence of a decimal point or the use of scientific notation, so care must be taken to avoid type overflow. For example, 9999999999999999999 will be considered to exceed the upper boundary of long integers and overflow, while 9999999999999999999.0 will be considered a valid floating point number.
 - VARBINARY is a data type for storing binary data, with a maximum length of 65,517 bytes for data columns and 16,382 bytes for label columns. Binary data can be written via SQL or schemaless methods (needs to be converted to a string starting with \x), or through stmt methods (can use binary directly). Displayed as hexadecimal starting with \x.
 
+- BLOB is a data type for storing binary data, with a maximum length of 419,430,465 bytes for data columns. BLOB data can be written via SQL or schemaless methods (needs to be converted to a string starting with \x), or through stmt methods (can use binary directly). Displayed as hexadecimal starting with \x.
 :::
 
 ### DECIMAL Data Type
@@ -75,6 +77,13 @@ When performing operations between integer types and the `DECIMAL` type, the int
 
 When querying `DECIMAL` type expressions, if the intermediate result of the calculation exceeds the maximum value that the current type can represent, a `DECIMAL_OVERFLOW` error is reported.
 
+### BLOB Data type 
+The BLOB data type is used for storing binary data, with a maximum length of 4,194,304 bytes. Binary data can be written via SQL or stmt2 by converting it to a string that starts with \x, or directly as binary data using the stmt interface. When displayed, BLOB data is shown in hexadecimal format starting with \x
+`Limitations`
+Only one BLOB column is allowed per table.
+BLOB columns are not supported as tag columns.
+Currently, BLOB is not supported in virtual tables or stream computing.
+Conditional filtering on BLOB columns is not supported.
 ## Constants
 
 TDengine supports multiple types of constants, details as shown in the table below: