diff --git a/cmake/cmake.version b/cmake/cmake.version
index 52730e84e5..622bd49fdf 100644
--- a/cmake/cmake.version
+++ b/cmake/cmake.version
@@ -2,7 +2,7 @@
IF (DEFINED VERNUMBER)
SET(TD_VER_NUMBER ${VERNUMBER})
ELSE ()
- SET(TD_VER_NUMBER "3.3.5.2.alpha")
+ SET(TD_VER_NUMBER "3.3.5.8.alpha")
ENDIF ()
IF (DEFINED VERCOMPATIBLE)
diff --git a/docs/en/28-releases/01-tdengine.md b/docs/en/28-releases/01-tdengine.md
index 9f4246c7a0..b2bfb30cfa 100644
--- a/docs/en/28-releases/01-tdengine.md
+++ b/docs/en/28-releases/01-tdengine.md
@@ -25,6 +25,10 @@ Download links for TDengine 3.x version installation packages are as follows:
import Release from "/components/ReleaseV3";
+## 3.3.5.8
+
+
+
## 3.3.5.2
diff --git a/docs/en/28-releases/03-notes/3.3.5.8.md b/docs/en/28-releases/03-notes/3.3.5.8.md
new file mode 100755
index 0000000000..be75272545
--- /dev/null
+++ b/docs/en/28-releases/03-notes/3.3.5.8.md
@@ -0,0 +1,66 @@
+---
+title: TDengine 3.3.5.8 Release Notes
+sidebar_label: 3.3.5.8
+description: Version 3.3.5.8 Notes
+slug: /release-history/release-notes/3.3.5.8
+---
+
+## Features
+ 1. feat: suppport tmq subscription with ONLY META in JDBC
+ 2. feat: support multiple-line SQL editor in Grafana
+ 3. feat: add support for VARBINARY/GEOMETRY in ODBC
+ 4. feat: support TDengine with ODBC dirver in Excel
+ 5. feat: taosX agent use specific port range in local connection
+
+## Enhancements
+ 1. enh: websocket handle consumer error when tmq polled nothing
+ 2. enh: JDBC add support for unsigned integers
+ 3. enh: expose global.written_concurrent configuration for kafka/mqtt/csv in Explorer
+ 4. enh: support integration with TDgpt in community version
+ 5. enh: support BinaryRowData type in flink
+ 6. enh: in stmt2 SQL statements, the LIMIT clause supports the use of ? as a parameter placeholder
+ 7. enh: enable compression via websocket in taosX backup
+ 8. enh: ODBC support SQL_ROWSET_SIZE in SQLSetStmtAttr
+ 9. enh: expose num.of.consumers/writters configurations in Explorer
+ 10. enh: Add connector files to the macOS installation package.
+ 11. enh: handle errors when poll result is null in rust connector
+ 12. enh: tsbs support csv output format
+ 13. enh: add Classified Connections Counts table in TDinsight
+ 14. enh: use consist float precision in explorer and tao shell
+ 15. enh: flink table support update/delete
+ 16. enh: taosX agent will resume connection when taosX server disconnected for long time
+
+## Fixes
+ 1. fix: explorer support signup email with dot `.`
+ 2. fix: flock syscall error on aws cloud storage in taosAdapter
+ 3. fix: modify boolean tag values in sub-tables results in erroneous metadata from data subscriptions.
+ 4. fix: allow spaces in columns of csv in explorer datain
+ 5. fix: resolved the issue of high CPU usage by the stmtbind thread when the system is in an idle state
+ 6. fix: health state tick to idle when no data consumed
+ 7. fix: fix security issues in JDBC sample code
+ 8. fix: fix upgrade compaibility issue of taosX
+ 9. fix: ODBC core when set SQL_ATTR_TXN_ISOLATION with SQLSetConnectAttr
+ 10. fix: received/processed_messages should be reset when task rerun
+ 11. fix: when restoring data using taosX, it may crash if the database is not specified
+ 12. fix: when creating a database, the keep_time_offset options supports suffixes h (hours) and d (days) for time values
+ 13. fix: potential deadlocks while drop stream
+ 14. fix: failed to write data in a dual-replica database when a single dnode is disconnected from the network
+ 15. fix: when querying the information_schema.ins_tables table, a "Sync leader is unreachable" error may be triggered if the Leader of the mnode changes.
+ 16. fix: the time-filtering query results involving composite primary keys were incorrect after data compact
+ 17. fix: when the join condition of the primary key column is not a simple equality condition, it may lead to incorrect JOIN results
+ 18. fix: error caused by cursor.fetchmany with custom length in python taosws
+ 19. fix: the issue where the "show grants" command returned an incorrect number of columns
+ 20. fix: unexpected backup points before schedule executing
+ 21. fix: taosX task does not restart after interrupted
+ 22. fix: jdbc select server_version() caused mem high-usage
+ 23. fix: when using the WHERE tbname IN () statement, executing LAST query may cause taosd crash if the subtables filtered out do not belong to the same super table
+ 24. fix: after taosd exits abnormally and is restarted, if the WAL that has not been written to the data file is too large, it may cause an OOM error during startup
+ 25. fix: when using interp interpolation, if the select list contains string constants or string tags, the returned string content may be incomplete.[#29353](https://github.com/taosdata/TDengine/issues/29353)
+ 26. fix: when performing a JOIN query on a super table, using a subquery as the right table may lead to missing results
+ 27. fix: syntax error while use DISTINCT and ORDER BY together.[#29263](https://github.com/taosdata/TDengine/issues/29263)
+ 28. fix: when using the CAST function to convert a floating-point number to a binary and then performing a comparison, the result may be inaccurate due to loss of precision[#29382](https://github.com/taosdata/TDengine/issues/29382)
+ 29. fix: after upgrading from version 3.3.4 to 3.3.5, the taosd service fails to start properly if the configured charset does not exist in the system
+ 30. fix: websocket api timing field should not be negtive
+ 31. fix: duplicates backup points in taosX
+ 32. fix: configuration item s3BucketName was incorrectly set as a global variable, leading to failures while file uploads to S3.
+
diff --git a/docs/zh/28-releases/01-tdengine.md b/docs/zh/28-releases/01-tdengine.md
index 88c07a89f4..435d5819ce 100644
--- a/docs/zh/28-releases/01-tdengine.md
+++ b/docs/zh/28-releases/01-tdengine.md
@@ -24,6 +24,10 @@ TDengine 3.x 各版本安装包下载链接如下：
import Release from "/components/ReleaseV3";
+## 3.3.5.8
+
+
+
## 3.3.5.2
diff --git a/docs/zh/28-releases/03-notes/3.3.5.8.md b/docs/zh/28-releases/03-notes/3.3.5.8.md
new file mode 100755
index 0000000000..07f9cf060b
--- /dev/null
+++ b/docs/zh/28-releases/03-notes/3.3.5.8.md
@@ -0,0 +1,65 @@
+---
+title: 3.3.5.8 版本说明
+sidebar_label: 3.3.5.8
+description: 3.3.5.8 版本说明
+---
+
+## 特性
+ 1. 特性：JDBC 支持 ONLY META 订阅
+ 2. 特性：Grafana 插件 SQL 编辑支持多行
+ 3. 特性：ODBC 支持 VARBINARY/GEOMETRY 类型
+ 4. 特性：支持 Excel 通过 ODBC 驱动连接 TDengine
+ 5. 特性：taosX agent 支持指定本地端口
+
+## 优化
+ 1. 优化：WebSocket 连接订阅消息为空时，支持获取错误
+ 2. 优化：JDBC 支持无符号整数
+ 3. 优化：MQTT/Kafka/CSV 新增写并发参数
+ 4. 优化：开源版本 TDengine 支持与 TDgpt 对接
+ 5. 优化：Flink 连接器支持 BinaryRowData 数据传输类型
+ 6. 优化：参数绑定 SQL 语句中，LIMIT 子句支持使用 ? 作为参数占位符
+ 7. 优化：taosX 备份开启 WebSocket 压缩
+ 8. 优化：ODBC SQLSetStmtAttr 支持 SQL_ROWSET_SIZE 属性
+ 9. 优化：TMQ 数据同步任务新增 Number Of Writters/Consumers 等参数
+ 10. 优化：mac 安装包增加连接器文件
+ 11. 优化：Rust 连接器支持订阅结果为空时的错误处理
+ 12. 优化：TSBS 支持生成 CSV 文件
+ 13. 优化：TDinsight 添加连接分类信息
+ 14. 优化：Explorer float 显示精度与 taos shell 一致
+ 15. 优化：Flink 连接器 Table 支持更新和删除操作
+ 16. 优化：taosX Agent 在 taosX 无法连接时可重试恢复
+
+## 修复
+ 1. 修复：Explorer 注册邮箱支持包含 "."
+ 2. 修复：AWS 云存储下 taosAdapter flock 失败
+ 3. 修复：修改子表中布尔类型标签的值时，数据订阅的元数据返回结果存在错误
+ 4. 修复：Explorer 导入 CSV 时列包含空格时预览将失效
+ 5. 修复：解决 stmtbind 线程在系统处于空闲状态时 CPU 占用过高的问题
+ 6. 修复：数据源任务不再处理数据时健康状态恢复为 Idle
+ 7. 修复：JDBC 示例代码安全漏洞
+ 8. 修复：taosX 平滑升级
+ 9. 修复：ODBC 调用 SQLSetConnectAttr 设置 SQL_ATTR_TXN_ISOLATION 时 core
+ 10. 修复：received/processed_messages 当前运行指标重启未清零
+ 11. 修复：使用 taosX 恢复数据时，若未指定数据库，系统可能崩溃
+ 12. 修复：创建数据库时，keep_time_offset 选项支持使用后缀 h和 d 来指定时间值
+ 13. 修复：删除流计算时可能的死锁
+ 14. 修复：双副本数据库在某个 dnode 断网后写入数据失败的问题
+ 15. 修复：查询 information_schema.ins_tables 表时，如果 mnode 的 Leader 发生变更，可能会触发 Sync leader is unreachable 错误
+ 16. 修复：数据重新整理后，涉及复合主键的时间过滤查询结果出现错误的问题
+ 17. 修复：当主键列的连接条件为非简单等值条件时，可能导致 JOIN 结果出现错误
+ 18. 修复：Python WebSocket 连接器 Cusor.fetchmany 接口自定义长度问题
+ 19. 修复：Show Grants 命令返回的列数目不正确的问题
+ 20. 修复：备份计划未启动时查看备份点列表不符合预期
+ 21. 修复：taosX 任务写入中断后未重新启动
+ 22. 修复：JDBC select server_version() 结果未释放导致内存持续增长
+ 23. 修复：在使用 WHERE tbname IN () 语句时，如果筛选出的子表不属于同一超级表，执行 LAST 查询可能会导致 taosd 崩溃
+ 24. 修复：taosd 异常退出并再次启动后，如果未进入数据文件的 WAL 过大，可能导致启动时 oom
+ 25. 修复：在使用 interp 插值填充时，如果 select list 中包含字符串常量或字符串标签列，返回的字符串内容可能会出现缺失的情况[#29353](https://github.com/taosdata/TDengine/issues/29353)
+ 26. 修复：在超级表上执行 JOIN 查询时，将子查询用作右表可能会导致结果缺失
+ 27. 修复：同时使用 DISTINCT 和 ORDER BY 关键字时出现的语法错误问题[#29263](https://github.com/taosdata/TDengine/issues/29263)
+ 28. 修复：使用 CAST 函数将浮点数转换为字符串后进行比较时，可能会因精度丢失而导致结果不准确[#29382](https://github.com/taosdata/TDengine/issues/29382)
+ 29. 修复：在从 3.3.4 版本升级到 3.3.5 版本后，如果配置的字符集在系统中不存在，taosd 服务将无法正常启动
+ 30. 修复：websocket 接口 timing 字段有时为负值
+ 31. 修复：taosX 备份任务显示备份点重复
+ 32. 修复：配置项 s3BucketName 被误设为全局变量参数，导致文件上传到 S3 失败
+