Skip to content

merge: from main to 3.0 branch #30653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guanshengliang merged 4 commits into from
Apr 4, 2025
+2 −2
Merged

merge: from main to 3.0 branch #30653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c704aa7
docs: update taosadapter monitoring metrics and fix TAG link case sen…
tomchon Apr 4, 2025
68d0227
Update docs/zh/14-reference/01-components/03-taosadapter.md
feici02 Apr 4, 2025
38f47a0
Merge pull request #30648 from taosdata/fix/broken-anchor
feici02 Apr 4, 2025
ff37707
Merge branch 'main' into merge/mainto3.0
tomchon Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/zh/14-reference/01-components/03-taosadapter.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ taosAdapter 和 TDengine server 需要使用相同版本。请通过升级 TDeng

使用命令 rmtaos 可以移除包括 taosAdapter 在内的 TDengine server 软件。

## 监控指标
## taosAdapter 监控指标

taosAdapter 目前仅采集 RESTful/WebSocket 相关请求的监控指标，其他接口暂无监控指标。

Expand Down
2 changes: 1 addition & 1 deletion docs/zh/14-reference/03-taos-sql/14-stream.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ subquery: SELECT select_list

stb_name 是保存计算结果的超级表的表名，如果该超级表不存在，会自动创建；如果已存在，则检查列的 schema 信息。详见 [写入已存在的超级表](#写入已存在的超级表)。

TAGS 子句定义了流计算中创建 TAG 的规则，可以为每个 partition 对应的子表生成自定义的 TAG 值，详见 [自定义 TAG](#自定义-TAG)
TAGS 子句定义了流计算中创建 TAG 的规则，可以为每个 partition 对应的子表生成自定义的 TAG 值，详见 [自定义 TAG](#自定义-tag)
```sql
create_definition:
col_name column_definition
Expand Down
Loading