Skip to content

Commit 88dcf28

Browse files
guanshengliangguanshengliang
authored
merge: from main to3.0 branch #35128 
2 parents 4455827 + b98f6f9 commit 88dcf28

32 files changed

Lines changed: 1244 additions & 75 deletions

File tree

‎docs/en/06-advanced/06-tdgpt/06-anomaly-detection/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ algo=expr1
3030
"}
3131
```
3232

33-
1. `column_name`: The data column in which to detect anomalies. Specify only one column per query. The data type of the column must be numerical; string types such as NCHAR are not supported. Functions are not supported.
33+
1. `column_name(s)`: The data column(s) in which to detect anomalies. The data type of the column(s) must be numerical; string types such as NCHAR are not supported. Functions are not supported. Starting from version 3.4.1.0, multi-column data input is supported for anomaly detection. For models that only handle a single column, only the first column will be used, and any additional columns will be ignored automatically.
3434
2. `options`: The parameters for anomaly detection. Enter parameters in key=value format, separating multiple parameters with a comma (,). It is not necessary to use quotation marks or escape characters. Only ASCII characters are supported. For example: `algo=ksigma,k=2` indicates that the anomaly detection algorithm is k-sigma and the k value is 2.
3535
3. You can use the results of anomaly detection as the inner part of a nested query. The same functions are supported as in other windowed queries.
3636
4. White noise checking is performed on the input data by default. If the input data is white noise, no results are returned.

‎docs/en/06-advanced/06-tdgpt/09-dev/02-algo/03-ad.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ sidebar_label: Anomaly Detection Algorithms
55

66
### Input Limitations
77

8-
`execute` is the core method of anomaly detection algorithms. Before calling this method, the framework configures the historical time-series data used for anomaly detection in the `self.list` object attribute.
8+
`execute` is the core method of anomaly detection algorithms. Before calling this method, the framework configures the historical time-series data used for anomaly detection in the `self.list` member variable.
9+
10+
Starting from version 3.4.1.0, a new Python member variable, `self.input_data_lists`, has been added to all anomaly detection classes inherited from `AbstractAnomalyDetectionService`. This object is an array of arrays (nested array) used to store all columns of multi-column input data for anomaly detection. For backward compatibility, the framework still keeps `self.list` as the first input column, while `self.input_data_lists` contains every input column. In `execute`, use `self.list` for single-column logic or backward-compatible implementations, and use `self.input_data_lists` when your algorithm needs access to multiple columns.
911

1012
### Output Limitations
1113

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,7 @@ The effective value of charset is UTF-8.
367367
| arbCheckSyncIntervalMs | | Supported, effective immediately | Internal parameter, for debugging synchronization module |
368368
| arbSetAssignedTimeoutMs | | Supported, effective immediately | Internal parameter, for debugging synchronization module |
369369
| syncTimeout | | Supported, effective immediately | Internal parameter, for debugging synchronization module |
370+
| syncAssignedCheckAppliedGap| After 3.4.1.0 | Supported, effective immediately | Threshold for the gap between peer's applied index and commit index before an assigned leader steps down in dual-replica mode. The assigned leader only steps down when the gap is within this value, preventing the peer from entering restoring state. 0 means no gap check (immediate step down). Range: 0-10000, default: 20. Internal parameter, for debugging synchronization module |
370371
| mndSdbWriteDelta | | Supported, effective immediately | Internal parameter, for debugging mnode module |
371372
| mndLogRetention | | Supported, effective immediately | Internal parameter, for debugging mnode module |
372373
| skipGrant | | Supported, effective after restart | Internal parameter, for authorization checks |

‎docs/en/14-reference/02-tools/07-taos-cli.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ You can change the behavior of the TDengine CLI by configuring command line para
6767
- -a AUTHSTR: Authorization information for connecting to the server.
6868
- -A: Calculate authorization information using username and password.
6969
- -B: Set BI tool display mode, after setting, all outputs follow the format of BI tools.
70+
- -H, --binary-as-hex: Display BINARY strings containing non-printable bytes in hexadecimal notation (`0x...`). Disabled by default.
7071
- -C: Print the configuration parameters of `taos.cfg` in the directory specified by -c.
7172
- -d DATABASE: Specifies the database to use when connecting to the server.
7273
- -E dsn: Connect to cloud services or servers providing WebSocket connections using WebSocket DSN.

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

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Support all platforms that can run Node.js.
2424

2525
| Node.js Connector Version | Major Changes | TDengine Version |
2626
| ------------------------- | ------------------------------------------------------------------------ | --------------------------- |
27+
| 3.4.0 | Supports BLOB data type | - |
2728
| 3.3.0 | Supports load balancing and failover | - |
2829
| 3.2.3 | 1. Supports token authentication. <br/> 2. Supports reporting connector version information. | - |
2930
| 3.2.2 | Fix timezone handling issues on Windows systems. | - |
@@ -67,6 +68,7 @@ The table below shows the mapping between TDengine DataType and Node.js DataType
6768
| JSON | string |
6869
| VARBINARY | ArrayBuffer |
6970
| GEOMETRY | ArrayBuffer |
71+
| BLOB | ArrayBuffer |
7072

7173
**Note**: JSON type is only supported in tags.
7274

@@ -279,23 +281,24 @@ The configurations in WSConfig are as follows:
279281
- `params`: List of boolean types.
280282
- **Exception**: Throws `TDWebSocketClientError` if connection fails.
281283
- The following interfaces are similar to setBoolean except for the type of value to be set:
282-
- `setTinyInt(params :any[])`
283-
- `setUTinyInt(params :any[])`
284-
- `setSmallInt(params :any[])`
285-
- `setUSmallInt(params :any[])`
286-
- `setInt(params :any[])`
287-
- `setUInt(params :any[])`
288-
- `setBigint(params :any[])`
289-
- `setUBigint(params :any[])`
290-
- `setFloat(params :any[])`
291-
- `setDouble(params :any[])`
292-
- `setVarchar(params :any[])`
293-
- `setBinary(params :any[])`
294-
- `setNchar(params :any[])`
295-
- `setJson(params :any[])`
296-
- `setVarBinary(params :any[])`
297-
- `setGeometry(params :any[])`
298-
- `setTimestamp(params :any[])`
284+
- `setTinyInt(params: any[])`
285+
- `setUTinyInt(params: any[])`
286+
- `setSmallInt(params: any[])`
287+
- `setUSmallInt(params: any[])`
288+
- `setInt(params: any[])`
289+
- `setUInt(params: any[])`
290+
- `setBigint(params: any[])`
291+
- `setUBigint(params: any[])`
292+
- `setFloat(params: any[])`
293+
- `setDouble(params: any[])`
294+
- `setVarchar(params: any[])`
295+
- `setBinary(params: any[])`
296+
- `setNchar(params: any[])`
297+
- `setJson(params: any[])`
298+
- `setVarBinary(params: any[])`
299+
- `setGeometry(params: any[])`
300+
- `setBlob(params: any[])`
301+
- `setTimestamp(params: any[])`
299302
- `async setTags(paramsArray:StmtBindParams): Promise<void>`
300303
- **Interface Description** Set table Tags data for automatic table creation.
301304
- **Parameter Description**:

‎docs/zh/06-advanced/06-TDgpt/06-dev/02-algo/03-ad.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ sidebar_label: "异常检测"
55

66
### 输入约定
77

8-
`execute` 是算法处理的核心方法。框架调用该方法之前，在对象属性参数 `self.list` 中已经设置完毕用于异常检测的时间序列数据。
8+
`execute` 是算法处理的核心方法。框架调用该方法之前，会在成员变量 `self.list` 中设置好用于异常检测的时间序列数据。
9+
10+
从 3.4.1.0 版本开始，对于每个从 `AbstractAnomalyDetectionService` 继承的异常检测类，还新增了一个 Python 成员变量 `self.input_data_lists`。该变量是一个二维数组，用于存储多列输入数据。为保持兼容性，`self.list` 仍表示第一列输入数据，而 `self.input_data_lists` 包含全部输入列。因此，算法作者在 `execute` 中如果只处理单列数据，可继续读取 `self.list`；如果需要处理多列数据，则应读取 `self.input_data_lists`。
911

1012
### 输出约定
1113

‎docs/zh/14-reference/01-components/01-taosd.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1667,6 +1667,17 @@ charset 的有效值是 UTF-8。
16671667
- 动态修改：支持通过 SQL 修改，立即生效。
16681668
- 支持版本：从 v3.3.6.23 版本开始引入
16691669

1670+
#### syncAssignedCheckAppliedGap
1671+
1672+
- 说明：双副本模式下，被指定为 assigned leader 的节点在 step down 前，检查对端 applied index 与 commit index 之间差距的阈值。仅当差距小于等于此值时才会 step down，避免对端因 applied index 尚未追上而进入 restoring 状态。设置为 0 表示不检查差距（保持旧行为，立即 step down）。用于同步模块调试 **`内部参数`**
1673+
- 类型：整数
1674+
- 默认值：20
1675+
- 最小值：0
1676+
- 最大值：10000
1677+
- 参数类型：全局配置参数
1678+
- 动态修改：支持通过 SQL 修改，立即生效。
1679+
- 支持版本：从 v3.4.1.0 版本开始引入
1680+
16701681
#### mndLogRetention
16711682

16721683
- 说明：用于 mnode 模块调试 **`内部参数`**

‎docs/zh/14-reference/02-tools/07-taos-cli.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ taos> quit
7272
- -a AUTHSTR：连接服务端的授权信息。
7373
- -A：通过用户名和密码计算授权信息。
7474
- -B：设置 BI 工具显示模式，设置后所有输出都遵循 BI 工具的格式进行输出。
75+
- -H, --binary-as-hex：将包含不可打印字符的 BINARY 字符串按十六进制形式显示（`0x...`），默认关闭。
7576
- -C：打印 -c 指定的目录中 `taos.cfg` 的配置参数。
7677
- -d DATABASE：指定连接到服务端时使用的数据库。
7778
- -E dsn：使用 WebSocket DSN 连接云服务或者提供 WebSocket 连接的服务端。

‎docs/zh/14-reference/05-connector/35-node.mdx‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Node.js 连接器源码托管在 [GitHub](https://github.com/taosdata/taos-conne
2323

2424
| Node.js 连接器 版本 | 主要变化 | TDengine TSDB 版本 |
2525
| ------------------| ----------------------| ----------------|
26+
| 3.4.0 | 支持 BLOB 数据类型 | - |
2627
| 3.3.0 | 支持负载均衡和故障转移 | - |
2728
| 3.2.3 | 1. 支持令牌身份认证 <br/> 2. 支持上报连接器版本信息 | - |
2829
| 3.2.2 | 修复 Windows 系统上的时区处理问题 | - |
@@ -67,6 +68,7 @@ Node.js 连接器源码托管在 [GitHub](https://github.com/taosdata/taos-conne
6768
| JSON | string |
6869
| VARBINARY | ArrayBuffer |
6970
| GEOMETRY | ArrayBuffer |
71+
| BLOB | ArrayBuffer |
7072

7173
**注意**：JSON 类型仅在 tag 中支持。
7274

@@ -279,23 +281,24 @@ WSConfig 中的配置如下：
279281
- `params`：布尔类型列表。
280282
- **异常**：连接失败抛出 `TDWebSocketClientError` 异常。
281283
- 下面接口除了要设置的值类型不同外，其余同 setBoolean：
282-
- `setTinyInt(params :any[])`
283-
- `setUTinyInt(params :any[])`
284-
- `setSmallInt(params :any[])`
285-
- `setUSmallInt(params :any[])`
286-
- `setInt(params :any[])`
287-
- `setUInt(params :any[])`
288-
- `setBigint(params :any[])`
289-
- `setUBigint(params :any[])`
290-
- `setFloat(params :any[])`
291-
- `setDouble(params :any[])`
292-
- `setVarchar(params :any[])`
293-
- `setBinary(params :any[])`
294-
- `setNchar(params :any[])`
295-
- `setJson(params :any[])`
296-
- `setVarBinary(params :any[])`
297-
- `setGeometry(params :any[])`
298-
- `setTimestamp(params :any[])`
284+
- `setTinyInt(params: any[])`
285+
- `setUTinyInt(params: any[])`
286+
- `setSmallInt(params: any[])`
287+
- `setUSmallInt(params: any[])`
288+
- `setInt(params: any[])`
289+
- `setUInt(params: any[])`
290+
- `setBigint(params: any[])`
291+
- `setUBigint(params: any[])`
292+
- `setFloat(params: any[])`
293+
- `setDouble(params: any[])`
294+
- `setVarchar(params: any[])`
295+
- `setBinary(params: any[])`
296+
- `setNchar(params: any[])`
297+
- `setJson(params: any[])`
298+
- `setVarBinary(params: any[])`
299+
- `setGeometry(params: any[])`
300+
- `setBlob(params: any[])`
301+
- `setTimestamp(params: any[])`
299302
- `async setTags(paramsArray:StmtBindParams): Promise<void>`
300303
- **接口说明** 设置表 Tags 数据，用于自动建表。
301304
- **参数说明**：

‎include/common/tglobal.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ extern int64_t tsSyncApplyQueueSize;
160160
extern int32_t tsRoutineReportInterval;
161161
extern bool tsSyncLogHeartbeat;
162162
extern int32_t tsSyncTimeout;
163+
extern int64_t tsSyncAssignedCheckAppliedGap;
163164

164165
// arbitrator
165166
extern int32_t tsArbHeartBeatIntervalSec;

0 commit comments

Comments
 (0)