Merge branch 'main' into merge/mainto3.0

Author: guanshengliang

cmake/define.cmake

@@ -145,7 +145,16 @@ IF(TD_WINDOWS)
         # /Zi  : generate a separate PDB file (previously /Zi- which disabled it entirely).
         # The PDB is NOT shipped to the user but must be archived internally per version
         # so that crash dumps from the field can be symbolicated with WinDbg / VS.
-        SET(COMMON_FLAGS "/W3 /D_WIN32 /DWIN32 /Zi /O2 /GL /MD")
+        IF(${BUILD_SANITIZER})
+            MESSAGE("${Green} will build with AddressSanitizer (MSVC ASan)! ${ColourReset}")
+            # /fsanitize=address: MSVC ASan (incompatible with /GL and /O2)
+            # _DISABLE_VECTOR_ANNOTATION/_DISABLE_STRING_ANNOTATION: suppress STL ASan
+            # annotations to avoid LNK2038 mismatch with pre-built libs (e.g. rocksdb)
+            # that were compiled without /fsanitize=address.
+            SET(COMMON_FLAGS "/W3 /D_WIN32 /DWIN32 /Zi /O1 /MD /fsanitize=address /D_DISABLE_VECTOR_ANNOTATION=1 /D_DISABLE_STRING_ANNOTATION=1")
+        ELSE()
+            SET(COMMON_FLAGS "/W3 /D_WIN32 /DWIN32 /Zi /O2 /GL /MD")
+        ENDIF()
     ELSE()
         MESSAGE("${Green} will build Debug version! ${ColourReset}")
         # NOTE: let cmake to choose default compile options

docs/en/06-advanced/01-subscription/01-topic.md

@@ -31,10 +31,10 @@ CREATE TOPIC [IF NOT EXISTS] topic_name as subquery;
 This SQL query subscribes to data using a SELECT statement (for example, SELECT * or SELECT ts, c1), and may include filter conditions and scalar function calculations. However, aggregate functions and time-window aggregations are not supported.
 
 1. Once this type of topic is created, the structure of the subscribed data is fixed.
-2. Columns or tags that are subscribed to or referenced in calculations cannot be deleted (`ALTER TABLE DROP`) or modified (`ALTER TABLE MODIFY`). From 3.4.0.0, you can modify and delete, but you need to reload the topic.
-3. If the table schema changes, any newly added columns will not appear in the subscription result.
-4. For SELECT \*, the subscription expands to include all columns present at creation time. For subtables and normal tables, these are data columns; for supertables, they include both data and tag columns.
-5. Query subscription on virtual tables is not supported.
+2. Columns or tags that are subscribed to or referenced in calculations cannot be deleted (`ALTER TABLE DROP`) or modified (`ALTER TABLE MODIFY`). From 3.4.0.0, you can modify or delete or add, but you need to execute the command of "reload topic".
+3. For SELECT \*, the subscription expands to include all columns present at creation time. For subtables and normal tables, these are data columns; for supertables, they include both data and tag columns.
+4. Query subscription on virtual tables is not supported.
+5. The super table, sub-table, and regular table within the subquery can be deleted. After deletion, the subscribed data becomes empty. If the table is recreated after deletion, the subscribed data remains empty because the table ID has changed. If you want to subscribe to the new table data, you can reload the topic using the reload topic syntax
 
 For example, if you need to subscribe to all smart meter records where the voltage is greater than 200, and only return the timestamp, current, and voltage (excluding the phase), you can create a topic named `power_topic` with the following SQL statement:
 
@@ -97,7 +97,7 @@ SHOW TOPICS;
 RELOAD TOPIC IF EXISTS topic_name as subquery;
 ```
 
-1. This syntax is supported since version 3.3.9 and is used to reload topics. It primarily addresses issues where the output results do not take effect after deleting or adding columns and tags in queries involving topic changes or tag lengths, as well as when selecting * to query subscriptions.
+1. This syntax is supported since version 3.4.0 and is used to reload topics. It primarily addresses issues where the output results do not take effect after deleting or adding columns and tags in queries involving topic changes or tag lengths, as well as when selecting * to query subscriptions.
 2. When it is necessary to change the schema of the subscription table structure, first stop consuming, then make the change, execute "reload topic", and then restart the subscription.
 
 The above SQL statement displays information about all topics in the current database.

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

@@ -199,7 +199,7 @@ auditLevel = 3 // AUDIT_LEVEL_DATABASE
 | recalc stream     | recalcStream | streamName | recalcName | SQL |
 | create topic    | createTopic | topic's DB | name of the created topic | SQL |
 | drop topic      | dropTopic | topic's DB | name of the deleted topic | SQL |
-| reload topic      | reloadTopic | NULL | name of the deleted topic | SQL |
+| reload topic      | reloadTopic | topic's DB | name of the topic | SQL |
 | create Rsma      | createRsma | Rsma name | NULL | SQL |
 | alter Rsma      | alterRsma | Rsma name | Table name | SQL |
 | drop Rsma      | dropRsma | Rsma name | NULL | SQL |

docs/en/14-reference/03-taos-sql/40-tmq.md

@@ -21,10 +21,10 @@ CREATE TOPIC [IF NOT EXISTS] topic_name as subquery
 Subscribe through a `SELECT` statement (including `SELECT *`, or specific query subscriptions like `SELECT ts, c1`, which can include conditional filtering and scalar function calculations, but do not support aggregate functions or time window aggregation). It is important to note:
 
 - Once this type of TOPIC is created, the structure of the subscribed data is fixed.
-- Columns or tags that are subscribed to or used for calculations cannot be deleted (`ALTER table DROP`) or modified (`ALTER table MODIFY`). From 3.4.0.0, you can modify and delete, but you need to reload the topic.
-- If there are changes to the table structure, new columns will not appear in the results.
+- Columns or tags that are subscribed to or used for calculations cannot be deleted (`ALTER table DROP`) or modified (`ALTER table MODIFY`). From 3.4.0.0, you can modify or delete or add, but you need to execute the command of "reload topic".
 - For `select *`, the subscription expands to include all columns at the time of creation (data columns for subtables and basic tables, data columns plus tag columns for supertables).
 - Query subscription on virtual tables is not supported.
+- The super table, sub-table, and regular table within the subquery can be deleted. After deletion, the subscribed data becomes empty. If the table is recreated after deletion, the subscribed data remains empty because the table ID has changed. If you want to subscribe to the new table data, you can reload the topic using the reload topic syntax
 
 ### Supertable topic
 
@@ -81,7 +81,7 @@ SHOW TOPICS;
 RELOAD TOPIC IF EXISTS topic_name as subquery;
 ```
 
-- This syntax is supported since version 3.3.9 and is used to reload topics. It primarily addresses issues where the output results do not take effect after deleting or adding columns and tags in queries involving topic changes or tag lengths, as well as when selecting * to query subscriptions.
+- This syntax is supported since version 3.4.0 and is used to reload topics. It primarily addresses issues where the output results do not take effect after deleting or adding columns and tags in queries involving topic changes or tag lengths, as well as when selecting * to query subscriptions.
 - When it is necessary to change the schema of the subscription table structure, first stop consuming, then make the change, execute "reload topic", and then restart the subscription.
 
 Displays information about all topics in the current database.

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

@@ -72,11 +72,13 @@ For error code information please refer to [Error Codes](../09-error-code.md)
 | JSON              | byte[]   |
 | VARBINARY         | byte[]   |
 | GEOMETRY          | byte[]   |
+| BLOB              | byte[]   |
 | DECIMAL           | decimal  |
 
 **Note**:
 
 - 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.

docs/zh/06-advanced/01-subscription/01-topic.md

@@ -27,10 +27,10 @@ CREATE TOPIC [IF NOT EXISTS] topic_name as subquery
 该 SQL 通过 SELECT 语句订阅（包括 SELECT *，或 SELECT ts, c1 等指定查询订阅，可以带条件过滤、标量函数计算，但不支持聚合函数、不支持时间窗口聚合）。需要注意的是：
 
 1. 该类型 TOPIC 一旦创建则订阅数据的结构确定。
-2. 被订阅或用于计算的列或标签不可被删除（ALTER table DROP）、修改（ALTER table MODIFY）。（从 3.4.0.0 开始，可以修改，删除，但是需要重新 reload topic）。
-3. 若发生表结构变更，新增的列不出现在结果中。
-4. 对于 select *，则订阅展开为创建时所有的列（子表、普通表为数据列，超级表为数据列加标签列）。
-5. 不支持虚拟表的查询订阅。
+2. 被订阅或用于计算的列或标签不可被删除（ALTER table DROP）、修改（ALTER table MODIFY）。（从 3.4.0.0 开始，可以修改，删除，增加，但是需要重新 reload topic）。
+3. 对于 select *，则订阅展开为创建时所有的列（子表、普通表为数据列，超级表为数据列加标签列）。
+4. 不支持虚拟表的查询订阅。
+5. subquery 里的超级表，子表，普通表可以被删除，删除后，订阅的数据为空。如果删除后重新建，订阅的数据仍然为空，因为表的 id 变了。如果想订阅到新的表数据，可以通过 reload topic 语法重新加载 topic 即可。
 
 假设需要订阅所有智能电表中电压值大于 200 的数据，且仅仅返回时间戳、电流、电压 3 个采集量（不返回相位），那么可以通过下面的 SQL 创建 power_topic 这个主题。
 
@@ -90,7 +90,7 @@ SHOW TOPICS;
 RELOAD TOPIC IF EXISTS topic_name as subquery;
 ```
 
-1. 该语法从 3.3.9 版本开始支持，用于重新加载主题，主要解决查询主题里变更列或 tag 长度，以及 select * 查询订阅时，删除增加列和 tag 后，输出结果不生效问题。
+1. 该语法从 3.4.0 版本开始支持，用于重新加载主题，主要解决查询主题里变更列或 tag 长度，以及 select * 查询订阅时，删除增加列和 tag 后，输出结果不生效问题。
 2. 需要变更订阅表结构的 schema 时，先停止消费，然后变更，然后执行 reload topic，接着重新开始订阅即可。
 
 上面的 SQL 会显示当前数据库下的所有主题的信息。

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

@@ -193,7 +193,7 @@ auditLevel = 3 // AUDIT_LEVEL_DATABASE
 | recalc stream     | recalcStream | streamName | recalcName | SQL |
 | create topic    | createTopic | topic 所在 DB | 创建的 topic 名字 | SQL |
 | drop topic      | dropTopic | topic 所在 DB | 删除的 topic 名字 | SQL |
-| reload topic      | reloadTopic | NULL | 删除的 topic 名字 | SQL |
+| reload topic      | reloadTopic | topic 所在 DB | topic 名字 | SQL |
 | create Rsma      | createRsma | Rsma name | NULL | SQL |
 | alter Rsma      | alterRsma | Rsma name | Table name | SQL |
 | drop Rsma      | dropRsma | Rsma name | NULL | SQL |

docs/zh/14-reference/03-taos-sql/40-tmq.md

@@ -23,10 +23,10 @@ CREATE TOPIC [IF NOT EXISTS] topic_name as subquery
 通过 `SELECT` 语句订阅（包括 `SELECT *` 或 `SELECT ts, c1` 等指定查询订阅，可以带条件过滤、标量函数计算，但不支持聚合函数、不支持时间窗口聚合）。需要注意的是：
 
 - 该类型 TOPIC 一旦创建则订阅数据的结构确定。
-- 被订阅或用于计算的列或标签不可被删除（`ALTER table DROP`）、修改（`ALTER table MODIFY`）。（从 3.4.0.0 开始，可以修改，删除，但是需要重新 reload topic）。
-- 若发生表结构变更，新增的列不出现在结果中。
+- 被订阅或用于计算的列或标签不可被删除（`ALTER table DROP`）、修改（`ALTER table MODIFY`）。（从 3.4.0.0 开始，可以修改，删除，增加，但是需要重新 reload topic）。
 - 对于 select \*，则订阅展开为创建时所有的列（子表、普通表为数据列，超级表为数据列加标签列）。
 - 不支持虚拟表的查询订阅。
+- subquery 里的超级表，子表，普通表可以被删除，删除后，订阅的数据为空。如果删除后重新建，订阅的数据仍然为空，因为表的 id 变了。如果想订阅到新的表数据，可以通过 reload topic 语法重新加载 topic 即可。
 
 ### 超级表 topic
 
@@ -83,7 +83,7 @@ SHOW TOPICS;
 RELOAD TOPIC IF EXISTS topic_name as subquery;
 ```
 
-1. 该语法从 3.3.9 版本开始支持，用于重新加载主题，主要解决查询主题里变更列或 tag 长度，以及 select * 查询订阅时，删除增加列和 tag 后，输出结果不生效问题。
+1. 该语法从 3.4.0 版本开始支持，用于重新加载主题，主要解决查询主题里变更列或 tag 长度，以及 select * 查询订阅时，删除增加列和 tag 后，输出结果不生效问题。
 2. 需要变更订阅表结构的 schema 时，先停止消费，然后变更，然后执行 reload topic，接着重新开始订阅即可。
 
 显示当前数据库下的所有主题的信息。

docs/zh/14-reference/05-connector/40-csharp.mdx

@@ -71,11 +71,13 @@ TDengine TSDB 其他功能模块的报错，请参考 [错误码](../../../refer
 | JSON                   | byte[]   |
 | VARBINARY              | byte[]   |
 | GEOMETRY               | byte[]   |
+| BLOB                   | byte[]   |
 | DECIMAL                | decimal  |
 
 **注意**：
 
 - JSON 类型仅在 tag 中支持。
+- BLOB 类型不支持作为 tag 列，不支持 stmt 参数化查询绑定。
 - GEOMETRY 类型是 little endian 字节序的二进制数据，符合 WKB 规范。详细信息请参考 [数据类型](../../taos-sql/datatype)。
 WKB 规范请参考 [Well-Known Binary (WKB)](https://libgeos.org/specifications/wkb/)。
 - DECIMAL 类型在 C# 中使用 `decimal` 类型表示，支持高精度的十进制数值。因为 C# 的 `decimal` 类型与 TDengine TSDB 的 DECIMAL 类型在精度和范围上有所不同，

include/common/tmsg.h

@@ -2710,7 +2710,14 @@ void    tFreeSRetrieveFuncRsp(SRetrieveFuncRsp* pRsp);
 
 typedef struct {
   int32_t       statusInterval;
-  int64_t       checkTime;                  // 1970-01-01 00:00:00.000
+  /*
+    Local timezone UTC offset in seconds (east-positive, e.g. +28800 for
+    Asia/Shanghai).  Derived from taosGetLocalTimezoneOffset() on each
+    status report.  Paired with the timezone string in
+    mndCheckClusterCfgPara: a mismatch is reported only when both the
+    timezone string AND this offset differ.
+  */
+  int64_t       checkTime;
   char          timezone[TD_TIMEZONE_LEN];  // tsTimezone
   char          locale[TD_LOCALE_LEN];      // tsLocale
   char          charset[TD_LOCALE_LEN];     // tsCharset