diff --git a/cmake/cmake.version b/cmake/cmake.version
index 622bd49fdf..302e70b05b 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.8.alpha")
+ SET(TD_VER_NUMBER "3.3.6.0.alpha")
ENDIF ()
IF (DEFINED VERCOMPATIBLE)
diff --git a/docs/en/28-releases/01-tdengine.md b/docs/en/28-releases/01-tdengine.md
index b2bfb30cfa..13fde90038 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.6.0
+
+
+
## 3.3.5.8
diff --git a/docs/en/28-releases/03-notes/3.3.6.0.md b/docs/en/28-releases/03-notes/3.3.6.0.md
new file mode 100755
index 0000000000..de2c02ab3b
--- /dev/null
+++ b/docs/en/28-releases/03-notes/3.3.6.0.md
@@ -0,0 +1,113 @@
+---
+title: TDengine 3.3.6.0 Release Notes
+sidebar_label: 3.3.6.0
+description: Version 3.3.6.0 Notes
+slug: /release-history/release-notes/3.3.6.0
+---
+
+## Features
+ 1. feat: supports Decimal data type
+ 2. feat: improve compatibility of taosc
+ 3. feat: support retrieving the values of other columns in the row returned by the single-row selection function through the cols keyword.
+ 4. feat: integrate with haixun database api
+ 5. feat: support constant as join primary key
+ 6. feat: change the max value of minFreeDiskSize to 2TB
+ 7. feat: supports control the retention period of time-series data in the supertable via the KEEP parameter.
+ 8. feat: support backup to s3 storage in taosX
+ 9. feat: effient data writing in JDBC
+ 10. feat: improve error handling of taosX
+ 11. feat: support persistent cache to guarantee data completement
+ 12. feat: interate with perspective BI library
+ 13. feat: support taos_validate_sql in websocket
+ 14. feat: integrate Tableau with ODBC driver
+ 15. feat: supports virtual table
+ 16. feat: taosbechmark can generate csv files
+ 17. feat: TDengine now integrate with FineBI
+ 18. feat: supports the use of virtual tables in stream computing
+ 19. feat: stream computing supports the continue_window_close trigger mode.
+ 20. feat: stream computing supports window event notification
+ 21. feat: stream computing support setting a minimum duration limit for event window and state window.
+ 22. feat: support for greatest and least Functions
+ 23. feat: provide an alias regexp for the operator match.
+ 24. feat: experimental decimal data types support in explorer
+ 25. feat: support decimal types in rust connector
+ 26. feat: taosX/agent support https connection
+ 27. feat: explorer add support for sql formatter
+ 28. feat: taosX support export/import data-in tasks
+ 29. feat: support request ts as primary key in opc-da
+
+## Enhancements
+ 1. enh: when the topic enables the "only meta" option, the data subscription interface will no longer transmit time-series data.
+ 2. enh: support compact TDB files.
+ 3. enh: execute stream creation asynchronously to reduce response time.
+ 4. enh: improve kafka performance in taosX
+ 5. enh: support index creation for tag fields of nchar and varchar types.
+ 6. enh: significantly enhance the data synchronization performance between clusters
+ 7. enh: optimize the distribution of data files across multiple disks within the same tier in multi-level storage
+ 8. enh: connectors support new subscription params
+ 9. enh: improve the write performance of automatic table creation
+ 10. enh: taosX should raise error when WAL retention period is 0
+ 11. enh: improve error messages in explorer
+ 12. enh: improve performance of mqtt fetching messages
+ 13. enh: c# connector add async receiver for websocket connection
+ 14. enh: filter timestamp by configuration for hebei power transform
+ 15. enh: suppport stmt via websocket in taosBenchmark
+ 16. enh: increase the error troubleshooting information for dual-replica databases
+ 17. enh: improve consumer polling strategy in ws(taosAdapter)
+ 18. enh: Interp function supports interpolation over a time range.
+ 19. enh: support for monitoring vnode recovery progress through SQL
+ 20. enh: tracking new database with replica cli
+ 21. enh: support the use of conditional expressions in the CAST function
+ 22. enh: supports using the LIKE keyword in the SHOW VARIABLES series commands to enable pattern matching for variable names.
+ 23. enh: root can view/edit all tasks in explorer
+ 24. enh: OPCDA datasource table template can use `{/tagname}{id}{_id}` extractor
+ 25. enh: introduce the "assign leader" command for dual-replica clusters to address the issue of cluster recovery when a dnode with a higher WAL version fails to start.
+ 26. enh: optimize the service recovery time of a dual-replica cluster after a single-node failure
+ 27. enh: refactor the STMT code to significantly enhance query and write performance.
+ 28. enh: improve benchmark writing robotics
+ 29. enh: extend the maximum password length to 255 characters.
+ 30. enh: when subscribe data, consumers can set the minimum rows and maximum waittime.
+ 31. enh: respect to log.* settings in configuration for opc logs
+ 32. enh: C taosws support session.timeout.ms
+ 33. enh: support long passwords with special characters in all components
+ 34. enh: support additional subscription parameters in JDBC
+ 35. enh: Python consumer can subscribe topic using newly added parameters
+ 36. enh: allow newly added subscription params without updating connectors
+ 37. enh: MQTT fallback to ssl when tcp failed
+ 38. enh: add a percentage sign (%) after the compression ratio value in the results displayed by show disk_info.
+ 39. enh: includes inspection tools in the Enterprise Edition.
+ 40. enh: stream computing supports sliding window in the force_window_close mode
+ 41. enh: supports silent uninstallation of the tar package using the -e parameter.
+ 42. enh: improve the efficiency of downsampling and group by tag queries
+ 43. enh: taosX does not allow start repeatedly
+ 44. enh: add DST(Daylight Saving Time) guideline
+ 45. enh: improve cpu/mem performance in OPC data-in
+ 46. enh: use fixed seconds format in explorer table view
+ 47. enh: support deletion of topics with active consumers.
+
+## Fixes
+ 1. fix: OOM may occur when dropping a super table containing a large number of child-tables.
+ 2. fix: taosX util to read archived data
+ 3. fix: explorer should raise error when password is not valid
+ 4. fix: In stmt2 interlace mode, asynchronous execution returns incorrect affectrow count.
+ 5. fix: explorer display error reason for backup tasks
+ 6. fix: vnode may go offline when dnode is overloaded
+ 7. fix: stream computing experiences a significant backlog of transactions during vgroup leader switch, resulting in computational delays.
+ 8. fix: fix explorer oss --version error
+ 9. fix: support special characters of password in Node.js
+ 10. fix: random value out of range in taosBenchmark
+ 11. fix: fix os error 10053 on windows for OPCUA
+ 12. fix: taosX panic when adapter/nginx restarted in some cases
+ 13. fix: the results of the show disk_info command are incorrect when configuring multi-level storage.
+ 14. fix: typo in the execution result of show .disk_info
+ 15. fix: when querying super table, using ORDER BY and LIMIT together may return an unexpected record.
+ 16. fix: allow health params in 2.x data-in
+ 17. fix: backup next execution time does allow past time
+ 18. fix: fix compatibility of backup task upgrading to latest
+ 19. fix: query error when performing a UNION operation on multiple nested queries.
+ 20. fix: in state window queries, if the same expression exists in both the PARTITION BY and SELECT clauses, it will cause taosd to crash.
+ 21. fix: when the subquery does not return any results but contains the LIMIT 1 clause, it may cause the result of the parent query to be abnormal or inaccurate.
+ 22. fix: taosc crash when table names contain `*`
+ 23. fix: on windows, closing a JDBC PreparedStatement while writing data may cause the JVM to crash.[#30106](https://github.com/taosdata/TDengine/issues/30106)
+ 24. fix: when using Websocket parameter binding to batch write data, Chinese characters in subtable names will cause garbled text[#29998](https://github.com/taosdata/TDengine/issues/29998)
+
diff --git a/docs/zh/28-releases/01-tdengine.md b/docs/zh/28-releases/01-tdengine.md
index ccdcb274e6..48d24bffbf 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.6.0
+
+
+
## 3.3.5.8
diff --git a/docs/zh/28-releases/03-notes/3.3.6.0.md b/docs/zh/28-releases/03-notes/3.3.6.0.md
new file mode 100755
index 0000000000..259c44a2c9
--- /dev/null
+++ b/docs/zh/28-releases/03-notes/3.3.6.0.md
@@ -0,0 +1,112 @@
+---
+title: 3.3.6.0 版本说明
+sidebar_label: 3.3.6.0
+description: 3.3.6.0 版本说明
+---
+
+## 特性
+ 1. 特性:支持 Decimal 数据类型
+ 2. 特性:客户端兼容性优化
+ 3. 特性:支持通过 cols 关键字获取单行选择函数返回结果所在行的其他列值
+ 4. 特性:增加海讯数据库适配支持
+ 5. 特性:支持将常量值作为连接主键
+ 6. 特性: 将参数 minFreeDiskSize 的最大值更改为2TB
+ 7. 特性:支持通过 KEEP 参数控制超级表的时序数据保存时长
+ 8. 特性:taosX 支持备份文件到 S3 存储
+ 9. 特性:JDBC 客户端高效写入
+ 10. 特性:taosX 异常数据处理优化
+ 11. 特性:MQTT 数据源本地持久
+ 12. 特性:支持接入可视化客户端库 Perspective
+ 13. 特性:WebSocket 接口支持 validate_sql
+ 14. 特性:使用 ODBC 集成 Tableau
+ 15. 特性:支持虚拟表
+ 16. 特性:taosbechmark 支持生成CSV文件
+ 17. 特性:TDengine 接入帆软 BI
+ 18. 特性:支持在流计算中使用虚拟表
+ 19. 特性:流计算支持 continue_window_close 触发模式
+ 20. 特性:流计算支持窗口事件通知机制
+ 21. 特性:流计算支持为事件窗口和状态窗口设置最小持续时长限制
+ 22. 特性:支持 Greatest、Least 函数
+ 23. 特性:为运算符 match 提供别名 regexp
+ 24. 特性:Explorer 支持 Decimal 数据类型
+ 25. 特性:Rust 连接器支持 Decimal 类型
+ 26. 特性:taosX/Agent 支持 HTTPS 连接
+ 27. 特性:Explorer 支持 SQL 格式化
+ 28. 特性:taosX 支持数据源任务导出和导入
+ 29. 特性:OPC-DA 支持轮询开始时间作为主键列
+
+## 优化
+ 1. 优化:当订阅主题启用 only meta 选项时,数据订阅接口将不再传输时序数据
+ 2. 优化:支持重新整理 tdb 文件
+ 3. 优化: 异步执行流创建操作以缩短响应时间
+ 4. 优化:taosX Kafka 写入性能提升
+ 5. 优化:支持为 nchar 和 varchar 类型的标签字段创建索引
+ 6. 优化:大幅提升集群之间的数据同步性能
+ 7. 优化:多级存储中同一层级数据文件在多个磁盘中的分布
+ 8. 优化:连接器支持订阅新参数
+ 9. 优化:提高自动建表的写入性能
+ 10. 优化:taosX 订阅任务在WAL 保留时长为 0 时报错
+ 11. 优化:Explorer 错误信息优化
+ 12. 优化:优化 MQTT 数据源接收性能
+ 13. 优化:C# 连接器异步接收 WebSocket 返回
+ 14. 优化:河北电力 Transform 支持外部过滤时间戳
+ 15. 优化:taosBenchmark 支持 WebSocket STMT 写入
+ 16. 优化:增加双副本数据库的错误排查信息
+ 17. 优化:taosAdapter 优化消息订阅机制
+ 18. 优化:Interp 函数支持插值时间范围
+ 19. 优化:支持通过 SQL 查看 Vnode 恢复进度
+ 20. 优化:双活命令行启动可同步新增数据库
+ 21. 优化:支持在 CAST 函数中使用判断表达式
+ 22. 优化:支持在 SHOW VARIABLES 系列命令中使用 LIKE 关键字,实现对变量名称的模糊匹配
+ 23. 优化:Explorer: root 用户可查看和修改所有用户创建的任务
+ 24. 优化:OPCDA 支持按 `{id} {/tagname} {_id}` 提取 Item ID
+ 25. 优化:为双副本集群增加 assign leader 命令,解决 WAL 版本较高节点无法启动导致的集群恢复问题。
+ 26. 优化:单节点故障后双副本集群恢复服务的时长
+ 27. 优化:重构 STMT 代码结构,显著提升查询与写入性能
+ 28. 优化:taosBechmark 高可靠写入优化
+ 29. 优化:密码最大长度扩展到 255 位
+ 30. 优化:消费者订阅数据时可设置最小拉取条数和最长等待时间
+ 31. 优化:opc 日志响应配置文件中 log 配置
+ 32. 优化:C WebSocket 连接器支持 session.timeout.ms
+ 33. 优化:各组件支持长密码及特殊字符
+ 34. 优化:JDBC 订阅消费者参数支持动态添加
+ 35. 优化:Python 订阅消费者参数支持动态添加
+ 36. 优化:连接器支持可变订阅消费者参数
+ 37. 优化:MQTT 未指定 SSL 失败时自动尝试 SSL 连接
+ 38. 优化:在 show disk_info 结果中,为压缩率数值添加百分号(%)
+ 39. 优化:在企业版中增加巡检工具
+ 40. 优化:流计算在 force_window_close 模式下支持滑动窗口
+ 41. 优化:支持在卸载 tar 安装包时通过参数 -e 实现静默卸载
+ 42. 优化:提高降采样和按标签分组查询的性能
+ 43. 优化:重复启动 taosX 报错
+ 44. 优化:添加夏令时使用指南
+ 45. 优化:优化 taosX OPC 数据源CPU和内存占用
+ 46. 优化:Explorer 表格显示时间戳使用固定精度
+ 47. 优化:支持删除存在活跃消费者的主题
+
+## 修复
+ 1. 修复:删除包含大量子表的超级表时可能出现的内存不足问题
+ 2. 修复:taosX 归档文档读取
+ 3. 修复:Explorer 密码不合法时应报错
+ 4. 修复:在 stmt2 的 interlace 写入模式下,异步执行返回的行数存在错误
+ 5. 修复:Explorer 显示备份任务异常原因
+ 6. 修复:dnode 过载情况下 vnode 可能离线的问题
+ 7. 修复:在 VGroup 主节点切换时,流计算可能出现大量事务积压,从而导致计算延迟
+ 8. 修复:Explorer 社区版版本号错误
+ 9. 修复:Node.js 连接器支持密码包含特殊字符
+ 10. 修复:taosBenchmark 随机值超出设置范围
+ 11. 修复:OPCUA 连接器 Windows 系统错误 10053
+ 12. 修复:Adapter 或 Nginx 重启某些情况下导致 taosX Panic
+ 13. 修复:配置了多级存储的集群,show disk_info 命令的结果不正确
+ 14. 修复:show .disk_info 执行结果中的文字显示错误
+ 15. 修复:在查询超级表时,若同时使用 ORDER BY 和 LIMIT,可能会返回一条非预期的记录
+ 16. 修复:2.x 数据源包含不支持的健康检查参数
+ 17. 修复:备份计划下次执行时间不允许设置为过去的时间
+ 18. 修复:旧版本备份任务兼容性
+ 19. 修复:在对多个嵌套查询语句执行UNION操作时,查询可能会出现错误。
+ 20. 修复:在状态窗口查询时,PARTITION BY 和 SELECT 子句中若存在相同表达式,会导致 taosd 崩溃
+ 21. 修复:当子查询未返回结果且其中包含 LIMIT 1 关键词时,可能导致父查询的结果出现异常或不准确
+ 22. 修复:当表名中包含 * 时,taosc 会出现崩溃问题。
+ 23. 修复:在 Windows 平台下,使用 JDBC PreparedStatement 写入数据时,关闭 PreparedStatement 可能导致 JVM 崩溃[#30106](https://github.com/taosdata/TDengine/issues/30106)
+ 24. 修复:使用 Websocket 参数绑定批量写入数据时,子表名含中文会产生乱码[#29998](https://github.com/taosdata/TDengine/issues/29998)
+