Merge remote-tracking branch 'origin/main' into fix/main/6487654850

Author: Peng Rongkun

cmake/in/lzma2.Makefile

@@ -7,7 +7,7 @@ CC:=gcc
 AR:=ar -rcs
 RM:=rm -rf
 
-ASFLAGS :=
+ASFLAGS := -Wa,--noexecstack
 
 SONAME:=libfast-lzma2.so.1
 REAL_NAME:=libfast-lzma2.so.1.0

conan/fast-lzma2/conanfile.py

@@ -50,6 +50,7 @@ def build(self):
 
         # Build make command
         cflags = "-Wall -O2 -pthread"
+        asflags = "-Wa,--noexecstack"
         if self.options.get_safe("fPIC"):
             cflags += " -fPIC"
 
@@ -59,7 +60,7 @@ def build(self):
 
         # Execute make compilation
         self.run(
-            f'make CFLAGS="{cflags}" CC={self.settings.get_safe("compiler", default="gcc")} libfast-lzma2',
+            f'make CFLAGS="{cflags}" ASFLAGS="{asflags}" CC={self.settings.get_safe("compiler", default="gcc")} libfast-lzma2',
             cwd=source_folder,
         )
 

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

@@ -85,7 +85,7 @@ If you are using Maven to manage your project, simply add the following dependen
 <dependency>
   <groupId>com.taosdata.jdbc</groupId>
   <artifactId>taos-jdbcdriver</artifactId>
-  <version>3.8.2</version>
+  <version>3.8.3</version>
 </dependency>
 ```
 

docs/en/08-operation/16-security.md

@@ -253,6 +253,7 @@ taosk -c /etc/taos \
 Parameter descriptions:
 
 - `-c`: Specify configuration file path, default `/etc/taos`
+- `-d`: Specify data directory (dataDir), default from configuration
 - `--set-cfg-algorithm`: Set configuration file encryption algorithm (sm4 or aes), default sm4
 - `--set-meta-algorithm`: Set metadata encryption algorithm (sm4 or aes), default sm4
 - `--encrypt-server`: Enable server encryption, optionally specify SVR_KEY, auto-generate if not specified
@@ -288,6 +289,39 @@ After keys are generated, they will be saved in the following locations:
 - `{dataDir}/dnode/config/master.bin`: Stores SVR_KEY and DB_KEY
 - `{dataDir}/dnode/config/derived.bin`: Stores CFG_KEY, META_KEY, and DATA_KEY
 
+### View Encrypted Configuration Files
+
+Use the `taosk` tool to view encrypted configuration file content:
+
+```shell
+taosk -d /var/lib/taos --view-config /path/to/encrypted_config.json
+```
+
+This command automatically loads keys from the data directory, decrypts and displays the configuration file content.
+
+### Edit Encrypted Configuration Files
+
+Use the `taosk` tool to directly edit encrypted configuration files:
+
+```shell
+taosk -d /var/lib/taos --edit-file /path/to/encrypted_config.json
+```
+
+This command will:
+
+1. Load CFG_KEY from the data directory
+2. Decrypt the configuration file to a temporary file (permissions 0600)
+3. Open the file with the system editor ($EDITOR or vi)
+4. Detect file changes via SHA-256 hash comparison
+5. If modified, automatically re-encrypt and write back to the original file
+6. Clean up temporary files
+
+**Notes**:
+
+- Keys containing CFG_KEY must be generated first (using `--encrypt-config` option)
+- Specify editor via EDITOR environment variable, e.g., EDITOR=nano taosk -d /var/lib/taos --edit-file ...
+- If you exit the editor without saving, the file will not be modified
+
 ### View Encryption Algorithms
 
 Users can view all built-in available encryption algorithms.

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

@@ -184,7 +184,6 @@ Additional Notes:
 | tagFilterCache           |                   | Supported, effective immediately   | Whether to cache tag filter results                          |
 | stableTagFilterCache     | since 3.3.8.6     | Supported, effective immediately   | In stream computing, whether to cache filter results of equal condition of tags. It will not become invalid due to adding or deleting child tables or updating the tag values or modifying super table tags. |
 | metaEntryCacheSize       | since  3.3.6.35   | Supported, effective immediately   | The reserved memory size to cache meta tags                  |
-| queryBufferSize          |                   | Supported, effective after restart | Not effective yet                                            |
 | queryRspPolicy           |                   | Supported, effective immediately   | Query response strategy                                      |
 | queryUseMemoryPool       |                   | Supported, effective after restart | Whether query will use memory pool to manage memory, default value: 1 (on); 0: off, 1: on |
 | minReservedMemorySize    |                   | Supported, effective immediately   | The minimum reserved system available memory size, all memory except reserved can be used for queries, unit: MB, default value: 0 (when set to 0, the system will automatically calculate the reserved memory size), value range 1024-1000000000 |
@@ -306,7 +305,6 @@ The effective value of charset is UTF-8.
 | ssPageCacheSize          | After 3.3.7.0     | Supported, effective after restart | Number of shared storage page cache pages, range 4-1048576, unit is pages, default value 4096; Enterprise parameter |
 | ssUploadDelaySec         | After 3.3.7.0     | Supported, effective immediately   | How long a data file remains unchanged before being uploaded to S3, range 1-2592000 (30 days), in seconds, default value 60; Enterprise parameter |
 | diskIDCheckEnabled       | After 3.3.5.0     | Not supported                      | Check if the disk ID where dataDir is located has changed when restarting dnode; 0: perform check, 1: do not perform check; default value 1 |
-| cacheLazyLoadThreshold   |                   | Supported, effective immediately   | Internal parameter, cache loading strategy                   |
 
 ### Cluster Related
 

docs/en/14-reference/01-components/08-config-scope.md

@@ -48,7 +48,6 @@ This document compares the configuration parameters of taosd (server-side) and t
 | countAlwaysReturnValue | both | Whether count/hyperloglog functions return a value when input data is empty or NULL |
 | tagFilterCache | taosd | Whether to cache tag filter results |
 | stableTagFilterCache | taosd | Whether to cache tag equal condition filter results.  It will not become invalid due to adding or deleting child tables or updating the tag values or modifying super table tags. |
-| queryBufferSize | taosd | Query available cache size |
 | queryRspPolicy | taosd | Query response strategy |
 | queryUseMemoryPool | taosd | Whether query will use memory pool to manage memory |
 | minReservedMemorySize | taosd | The minimum reserved system available memory size |
@@ -92,7 +91,6 @@ This document compares the configuration parameters of taosd (server-side) and t
 | ssAccessString | taosd | A string which contains various options for accessing the shared storage |
 | ssPageCacheSize | taosd | Number of shared storage page cache pages |
 | ssUploadDelaySec | taosd | How long a data file remains unchanged before being uploaded to shared storage |
-| cacheLazyLoadThreshold | taosd | Cache loading strategy |
 | **Cluster Related** | | |
 | supportVnodes | taosd | Maximum number of vnodes supported by a dnode |
 | numOfCommitThreads | taosd | Maximum number of commit threads |

docs/en/14-reference/03-taos-sql/20-select.md

@@ -659,7 +659,7 @@ A non-correlated scalar subquery is a type of independent executable subquery in
 
 Non-correlated scalar subqueries can independently compute the result first, and then substitute that result into the outer query as a filter condition or reference value. They are commonly used in scenarios involving filtering based on aggregate values (such as average, maximum) or combining results from multiple table queries. Non-correlated scalar subqueries have higher execution efficiency than correlated subqueries.
 
-Since version 3.4.0.0, TDengine TSDB has begun to support non-correlated scalar subqueries in query statements. Other statements (such as stream computations, subscriptions, DDL, DML, etc.) are not yet supported.
+Since version 3.4.0.0, TDengine TSDB supports non-correlated scalar subqueries in query statements. Starting from version 3.4.1.0, stream computing also supports them. Other statements (such as subscriptions, DDL, and DML, except for INSERT INTO ... SELECT) are not yet supported.
 
 Examples of non-correlated scalar subqueries appearing in SELECT and WHERE clauses are as follows:
 
@@ -670,7 +670,7 @@ SELECT col1 FROM tb2 WHERE col1 >= (SELECT avg(col1) FROM tb1);
 
 ## Subquery expression
 
-Starting from version 3.4.1.0, TDengine TSDB began to support the following subquery expressions, where the subqueries are limited to non-correlated subqueries, currently only supported for use in query statements, and not yet supported in statements such as stream computing, subscriptions, DDL (Data Definition Language), and DML (Data Manipulation Language).
+Starting from version 3.4.1.0, TDengine TSDB supports the following subquery expressions. These subqueries must be non-correlated and are currently supported in query statements and stream computing, but not yet in subscriptions, DDL (Data Definition Language), or DML (Data Manipulation Language) statements (except for INSERT INTO ... SELECT).
 
 ### IN Subquery
 

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

@@ -40,6 +40,7 @@ The JDBC driver implementation for TDengine strives to be consistent with relati
 
 | taos-jdbcdriver Version | Major Changes                                                                                                                                                                                                                                                                                                                                                                                                                              | TDengine Version   |
 | ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------ |
+| 3.8.3                   | Fixed the bug where BearerToken-based authentication in data subscriptions incorrectly required a username.                                                                                                                                                                                                                                                                                                                                                                       | -                  |
 | 3.8.2                   | Support for BearerToken-based authentication in data subscriptions.                                                                                                                                                                                                                                                                                                                                                                         | -                  |
 | 3.8.1                   | Decimal and Blob types support writing via parameter binding.                                                                                                                                                                                                                                                                                                                                                                              | -                  |
 | 3.8.0                   | 1. Load balancing adopts the least connections algorithm. <br/> 2. Supports connection rebalancing after failure node recovery. <br/> 3. Supports reporting connector type and version. <br/> 4. Supports BearerToken authentication. <br/> 5. Fixed the nanosecond precision issue when parameter binding includes sub-table names. <br/> 6. Log desensitization optimization. <br/>                                                      | -                  |

docs/en/14-reference/05-connector/35-node.md

@@ -24,7 +24,7 @@ Support all platforms that can run Node.js.
 
 | Node.js Connector Version | Major Changes                                                            | TDengine Version            |
 | ------------------------- | ------------------------------------------------------------------------ | --------------------------- |
-| 3.4.0                     | Supports BLOB data type | - |
+| 3.4.0                     | 1. Supports BLOB data type. <br/> 2. Parameter binding supports DECIMAL data type. <br/> 3. Supports reporting user APP name and IP address. | - |
 | 3.3.0                     | Supports load balancing and failover | - |
 | 3.2.3                     | 1. Supports token authentication. <br/> 2. Supports reporting connector version information. | - |
 | 3.2.2                     | Fix timezone handling issues on Windows systems. | - |
@@ -66,6 +66,7 @@ The table below shows the mapping between TDengine DataType and Node.js DataType
 | BINARY            | string           |
 | NCHAR             | string           |
 | JSON              | string           |
+| DECIMAL           | string           |
 | VARBINARY         | ArrayBuffer      |
 | GEOMETRY          | ArrayBuffer      |
 | BLOB              | ArrayBuffer      |
@@ -88,7 +89,7 @@ The table below shows the mapping between TDengine DataType and Node.js DataType
 - The Node.js connector (`@tdengine/websocket`) supports Node.js version 14 and above. Versions below 14 may have package compatibility issues.
 - Currently, only WebSocket connections are supported, and taosAdapter needs to be started in advance.
 - After using the connector, you need to call taos.connectorDestroy(); to release the connector resources.
-- To set the time zone for time strings in SQL statements, you need to configure the time zone settings of taosc on the machine where taosadapter is located.
+- To set the time zone for time strings in SQL statements, you need to configure the time zone settings of taosc on the machine where taosAdapter is located.
 - When parsing result sets, JavaScript does not support the int64 type, so timezone conversion cannot be directly performed. If users have such requirements, third-party libraries can be introduced to provide support.
 
 ## Common Issues
@@ -164,6 +165,8 @@ The configurations in WSConfig are as follows:
 - setTimeOut(ms : number) Set the connection timeout in milliseconds.
 - setToken(token: string) Set the cloud service authentication token.
 - setBearerToken(token: string) Set the TDengine TSDB authentication token, which has higher priority than username and password.
+- setUserApp(userApp: string) Set the name of the app reported by the user.
+- setUserIp(userIp: string) Set the IP address reported by the user.
 
 ### Connection Features
 
@@ -298,6 +301,7 @@ The configurations in WSConfig are as follows:
   - `setVarBinary(params: any[])`
   - `setGeometry(params: any[])`
   - `setBlob(params: any[])`
+  - `setDecimal(params: any[])`
   - `setTimestamp(params: any[])`
 - `async setTags(paramsArray:StmtBindParams): Promise<void>`
   - **Interface Description** Set table Tags data for automatic table creation.

docs/en/14-reference/05-connector/40-csharp.md

@@ -79,15 +79,15 @@ For error code information please refer to [Error Codes](../09-error-code.md)
 
 - JSON type is only supported in tags.
 - BLOB type is not supported as a tag column and does not support stmt parameterized query binding.
-- The GEOMETRY type is binary data in little endian byte order, conforming to the WKB standard. For more details, please refer to [Data Types](../03-taos-sql/01-datatype.md)
-For WKB standard, please refer to [Well-Known Binary (WKB)](https://libgeos.org/specifications/wkb/)
-- The DECIMAL type in C# is represented using the `decimal` type, which supports high-precision decimal numbers.
+- The GEOMETRY type is binary data in little endian byte order, conforming to the WKB standard. For more details, please refer to [Data Types](../03-taos-sql/01-datatype.md). For WKB standard, please refer to [Well-Known Binary (WKB)](https://libgeos.org/specifications/wkb/).
+- The DECIMAL type is not supported as a tag column. In C#, it is represented using the `decimal` type, which supports high-precision decimal numbers.
   Since C#'s `decimal` type differs from TDengine's DECIMAL type in precision and range,
   the C#'s `decimal` has a maximum precision of 29 digits, while TDengine's DECIMAL type supports up to 38 digits of precision.
   The following should be noted when using it:
   - When the value does not exceed the range of C#'s `decimal` type, you can use `GetDecimal` or `GetValue` to retrieve it.
   - When the value exceeds the range of C#'s `decimal` type, the `GetDecimal` and `GetValue` methods will throw an `OverflowException`.
   In such cases, you can use the `GetString` method to obtain the string representation.
+  - When binding DECIMAL columns via stmt parameter binding, both `string` and C# `decimal` types are supported. C# `decimal` values are automatically converted to strings before being sent to the server. If the value's precision exceeds 29 digits, use the `string` type to avoid precision loss.
 
 ## Summary of Example Programs