Merge branch 'main' into merge/mainto3.03

Jenkinsfile2

@@ -70,7 +70,7 @@ def check_docs(){
             returnStdout: true
         )
         
-        def file_no_doc_changed = sh (
+        file_no_doc_changed = sh (
             script: '''
                 cd ${WKC}
                 git --no-pager diff --name-only FETCH_HEAD `git merge-base FETCH_HEAD ${CHANGE_TARGET}`|grep -v "^docs/en/"|grep -v "^docs/zh/"|grep -v ".md$" || :

README.md

@@ -22,7 +22,7 @@
 [![LinkedIn](https://img.shields.io/badge/Follow_LinkedIn--white?logo=linkedin&style=social)](https://www.linkedin.com/company/tdengine)
 [![StackOverflow](https://img.shields.io/badge/Ask_StackOverflow--white?logo=stackoverflow&style=social&logoColor=orange)](https://stackoverflow.com/questions/tagged/tdengine)
 
-English | [简体中文](README-CN.md) | [TDengine Cloud](https://cloud.tdengine.com) | [Learn more about TSDB](https://tdengine.com/tsdb/)
+English | [简体中文](README-CN.md) | [TDengine Cloud](https://cloud.tdengine.com) | [Learn more about TSDB](https://tdengine.com/time-series-database/)
 
 # Table of Contents
 

docs/en/10-third-party/05-bi/12-tableau.md

@@ -0,0 +1,41 @@
+---
+sidebar_label: Tableau
+title: Integration With Tableau
+toc_max_heading_level: 4
+---
+
+Tableau is a well-known business intelligence tool that supports multiple data sources, making it easy to connect, import, and integrate data. And through an intuitive user interface, users can create rich and diverse visual charts, with powerful analysis and filtering functions, providing strong support for data decision-making. Users can import tag data, raw time-series data, or time-series data aggregated over time from TDengine into Tableau via the TDengine ODBC Connector to create reports or dashboards, and no code writing is required throughout the entire process.
+
+## Prerequisites
+
+Prepare the following environment:
+
+- TDengine 3.3.5.4 and above version is installed and running normally (both Enterprise and Community versions are available)
+- taosAdapter is running normally, refer to [taosAdapter Reference](../../../tdengine-reference/components/taosadapter/)
+- Install and run Tableau Desktop (if not installed, please download and install Windows operating system 64-bit [Download Tableau Desktop](https://www.tableau.com/products/desktop/download)). Install Tableau please refer to [Tableau Desktop](https://www.tableau.com).
+- Download the latest Windows operating system X64 client driver from the TDengine official website and install it, refer to [Install ODBC Driver](../../../tdengine-reference/client-libraries/odbc/#Installation).
+
+## Configure Data Source
+
+**Step 1**, Search and open the "ODBC Data Source (64 bit)" management tool in the Start menu of the Windows operating system and configure it, refer to [Install ODBC Driver](../../../tdengine-reference/client-libraries/odbc/#Installation).
+
+**Step 2**, Start Tableau in the Windows system environment, then search for "ODBC" on its connection page and select "Other Databases (ODBC)".
+
+**Step 3**, Click the `DSN` radio button, then select the configured data source (MyTDengine), and click the `Connect` button. After the connection is successful, delete the content of the string attachment, and finally click the `Sign In` button.  
+
+![tableau-odbc](./tableau/tableau-odbc.jpg)
+
+## Data Analysis
+
+**Step 1**, In the workbook page, the connected data sources will be displayed. Clicking on the dropdown list of databases will display the databases that require data analysis. On this basis, click the search button in the table options to display all tables in the database. Then, drag the table to be analyzed to the right area to display the table structure.
+
+![tableau-workbook](./tableau/tableau-table.jpg)
+
+**Step 2**, Click the `Update Now` button below to display the data in the table.
+
+![tableau-workbook](./tableau/tableau-data.jpg)
+
+**Step 3**, Click on the "Worksheet" at the bottom of the window to pop up the data analysis window, which displays all the fields of the analysis table. Drag the fields to the rows and columns to display the chart.
+
+![tableau-workbook](./tableau/tableau-analysis.jpg)
+

docs/en/10-third-party/05-bi/13-excel.md

@@ -0,0 +1,42 @@
+---
+sidebar_label: Excel
+title: Integration With Excel
+toc_max_heading_level: 4
+---
+
+ By configuring the use of the ODBC connector, Excel can quickly access data from TDengine. Users can import tag data, raw time-series data, or time-aggregated time series data from TDengine into Excel to create reports or dashboards, all without the need for any coding.
+
+## Prerequisites
+
+Prepare the following environment:
+
+- TDengine 3.3.5.7 and above version is installed and running normally (both Enterprise and Community versions are available).
+- taosAdapter is running normally, refer to [taosAdapter Reference](../../../tdengine-reference/components/taosadapter/).
+- Install and run Excel. If not installed, please download and install it. For specific instructions, please refer to Microsoft's official documentation.
+- Download the latest Windows operating system X64 client driver from the TDengine official website and install it, refer to [Install ODBC Driver](../../../tdengine-reference/client-libraries/odbc/#Installation).
+
+## Configure Data Source
+
+**Step 1**, Search and open the [ODBC Data Source (64 bit)] management tool in the Start menu of the Windows operating system and configure it, refer to [Install ODBC Driver](../../../tdengine-reference/client-libraries/odbc/#Installation).
+  
+**Step 2**, Start Excel in the Windows system environment, then select [Data] -> [Get Data] -> [From Other Sources] -> [From ODBC].   
+
+![excel-odbc](./excel/odbc-menu.jpg) 
+
+**Step 3**, In the pop-up window, select the data source you need to connect to from the drop-down list of [Data source name (DSN)], and then click the [OK] button.  
+
+![excel-odbc](./excel/odbc-select.jpg) 
+
+**Step 4**, Enter the username and password for TDengine. 
+
+![excel-odbc](./excel/odbc-config.jpg) 
+
+**Step 5**, In the pop-up [Navigator] dialog box, select the database tables you want to load, and then click [Load] to complete the data loading. 
+
+![excel-odbc](./excel/odbc-load.jpg)
+
+## Data Analysis
+
+Select the imported data. On the [Insert] tab, choose the column chart, and then configure the data fields in the [PivotChart Fields] pane on the right.
+
+![excel-odbc](./excel/odbc-data.jpg)

docs/examples/flink/Main.java

@@ -559,7 +559,7 @@ splitSql.setSelect("ts, current, voltage, phase, groupid, location")
                 " tbname VARCHAR(255)" +
                 ") WITH (" +
                 "  'connector' = 'tdengine-connector'," +
-                "  'td.jdbc.mode' = 'cdc'," +
+                "  'td.jdbc.mode' = 'sink'," +
                 "  'td.jdbc.url' = 'jdbc:TAOS-WS://localhost:6041/power_sink?user=root&password=taosdata'," +
                 "  'sink.db.name' = 'power_sink'," +
                 "  'sink.supertable.name' = 'sink_meters'" +

docs/zh/10-third-party/05-bi/12-tableau.md

@@ -3,33 +3,37 @@ sidebar_label: Tableau
 title: 与 Tableau 集成
 ---
 
-Tableau 是一款知名的商业智能工具，它支持多种数据源，可方便地连接、导入和整合数据。并且可以通过直观的操作界面，让用户创建丰富多样的可视化图表，并具备强大的分析和筛选功能，为数据决策提供有力支持。
+Tableau 是一款知名的商业智能工具，它支持多种数据源，可方便地连接、导入和整合数据。并且可以通过直观的操作界面，让用户创建丰富多样的可视化图表，并具备强大的分析和筛选功能，为数据决策提供有力支持。用户可通过 TDengine ODBC Connector 将标签数据、原始时序数据或者经时间聚合后的时序数据从 TDengine 导入到 Tableau，用以制作报表或仪表盘，且整个过程无需编写任何代码。
 
 ## 前置条件
 
 准备以下环境：
-- TDengine 3.3.5.4以上版本集群已部署并正常运行（企业及社区版均可）
-- taosAdapter 能够正常运行。详细参考 [taosAdapter 使用手册](../../../reference/components/taosadapter)
-- Tableau 桌面版安装并运行（如未安装，请下载并安装 Windows 操作系统 32/64 位 [Tableau 桌面版](https://www.tableau.com/products/desktop/download) ）。安装 Tableau 桌面版请参考 [官方文档](https://www.tableau.com)。
-- ODBC 驱动安装成功。详细参考[安装 ODBC 驱动](../../../reference/connector/odbc/#安装)
-- ODBC 数据源配置成功。详细参考[配置ODBC数据源](../../../reference/connector/odbc/#配置数据源)
+- TDengine 3.3.5.4 以上版本集群已部署并正常运行（企业及社区版均可）
+- taosAdapter 能够正常运行。详细参考 [taosAdapter 参考手册](../../../reference/components/taosadapter)
+- Tableau 桌面版安装并运行（如未安装，请下载并安装 Windows 操作系统 64 位 [Tableau 桌面版](https://www.tableau.com/products/desktop/download) ）。安装 Tableau 桌面版请参考 [官方文档](https://www.tableau.com)。
+- 从TDengine官网下载最新的Windows操作系统X64客户端驱动程序，并进行安装。详细参考 [安装 ODBC 驱动](../../../reference/connector/odbc/#安装)。
 
-## 加载和分析 TDengine 数据
 
-**第 1 步**，在 Windows 系统环境下启动 Tableau，之后在其连接页面中搜索 “ODBC”，并选择 “其他数据库 (ODBC)”。
+## 配置数据源
 
-**第 2 步**，点击 DNS 单选框，接着选择已配置好的数据源(MyTDengine)，然后点击连接按钮。待连接成功后，删除字符串附加部分的内容，最后点击登录按钮即可。
+**第 1 步**，在Windows操作系统的开始菜单中搜索并打开“ODBC数据源（64位）”管理工具并进行配置。详细参考[配置ODBC数据源](../../../reference/connector/odbc/#配置数据源)。
+
+**第 2 步**，在 Windows 系统环境下启动 Tableau，之后在其连接页面中搜索 “ODBC”，并选择 “其他数据库 (ODBC)”。 
+ 
+**第 3 步**，点击 `DSN` 单选框，接着选择已配置好的数据源(MyTDengine)，然后点击`连接`按钮。待连接成功后，删除字符串附加部分的内容，最后点击`登录`按钮即可。
 
 ![tableau-odbc](./tableau/tableau-odbc.jpg) 
 
-**第 3 步**，在弹出的工作簿页面中，会显示已连接的数据源。点击数据库的下拉列表，会显示需要进行数据分析的数据库。在此基础上，点击表选项中的查找按钮，即可将该数据库下的所有表显示出来。然后，拖动需要分析的表到右侧区域，即可显示出表结构。
+## 数据分析
+
+**第 1 步**，在工作簿页面中，选择已连接的数据源。点击数据库的下拉列表，会显示需要进行数据分析的数据库。在此基础上，点击表选项中的查找按钮，即可将该数据库下的所有表显示出来。然后，拖动需要分析的表到右侧区域，即可显示出表结构。
 
 ![tableau-workbook](./tableau/tableau-table.jpg) 
 
-**第 4 步**，点击下方的"立即更新"按钮，即可将表中的数据展示出来。
+**第 2 步**，点击下方的"立即更新"按钮，即可将表中的数据展示出来。
 
 ![tableau-workbook](./tableau/tableau-data.jpg) 
 
-**第 5 步**，点击窗口下方的"工作表"，弹出数据分析窗口， 并展示分析表的所有字段,将字段拖动到行列即可展示出图表。
+**第 3 步**，点击窗口下方的"工作表"，弹出数据分析窗口， 并展示分析表的所有字段,将字段拖动到行列即可展示出图表。
 
 ![tableau-workbook](./tableau/tableau-analysis.jpg) 

docs/zh/10-third-party/05-bi/13-excel.md

@@ -0,0 +1,40 @@
+---
+sidebar_label: Excel
+title: 与 Excel 集成
+---
+
+通过配置使用 ODBC 连接器，Excel 可以快速访问 TDengine 的数据。用户可以将标签数据、原始时序数据或按时间聚合后的时序数据从 TDengine 导入到 Excel，用以制作报表整个过程不需要任何代码编写过程。
+
+## 前置条件
+
+准备以下环境：
+- TDengine 3.3.5.7 以上版本集群已部署并正常运行（企业及社区版均可）。
+- taosAdapter 能够正常运行，详细参考 [taosAdapter 参考手册](../../../reference/components/taosadapter)。
+- Excel 安装并运行, 如未安装，请下载并安装, 具体操作请参考 Microsoft 官方文档。
+- 从 TDengine 官网下载最新的 Windows 操作系统 X64 客户端驱动程序并进行安装，详细参考 [安装 ODBC 驱动](../../../reference/connector/odbc/#安装)。
+
+## 配置数据源
+
+**第 1 步**，在 Windows 操作系统的开始菜单中搜索并打开【ODBC数据源（64位）】管理工具并进行配置。详细参考 [配置ODBC数据源](../../../reference/connector/odbc/#配置数据源)。
+   
+**第 2 步**，在 Windows 系统环境下启动 Excel，之后选择【数据】->【获取数据】->【自其他源】->【从ODBC】。 
+
+![excel-odbc](./excel/odbc-menu.jpg) 
+
+**第 3 步**，在弹出窗口的【数据源名称(DSN)】下拉列表中选择需要连接的数据源后，点击【确定】按钮。
+
+![excel-odbc](./excel/odbc-select.jpg) 
+
+**第 4 步**，输入 TDengine 的用户名密码。
+
+![excel-odbc](./excel/odbc-config.jpg) 
+
+**第 5 步**，在弹出的【导航器】对话框中，选择要加载的库表, 并点击【加载】完成数据加载。
+
+![excel-odbc](./excel/odbc-load.jpg)
+
+## 数据分析
+
+选中导入的数据，在【插入】选项卡中选择柱状图，并且在右侧的【数据透视图】中配置数据字段。
+
+![excel-odbc](./excel/odbc-data.jpg)

source/client/src/clientRawBlockWrite.c

@@ -799,7 +799,7 @@ static void processAlterTable(SMqMetaRsp* metaRsp, cJSON** pJson) {
           if (vAlterTbReq.tagType == TSDB_DATA_TYPE_VARBINARY) {
             bufSize = vAlterTbReq.nTagVal * 2 + 2 + 3;
           } else {
-            bufSize = vAlterTbReq.nTagVal + 3;
+            bufSize = vAlterTbReq.nTagVal + 32;
           }
           buf = taosMemoryCalloc(bufSize, 1);
           RAW_NULL_CHECK(buf);
@@ -2404,8 +2404,6 @@ static void processSimpleMeta(SMqMetaRsp* pMetaRsp, cJSON** meta) {
     processAlterTable(pMetaRsp, meta);
   } else if (pMetaRsp->resMsgType == TDMT_VND_DROP_TABLE) {
     processDropTable(pMetaRsp, meta);
-  } else if (pMetaRsp->resMsgType == TDMT_VND_DROP_TABLE) {
-    processDropTable(pMetaRsp, meta);
   } else if (pMetaRsp->resMsgType == TDMT_VND_DELETE) {
     processDeleteTable(pMetaRsp, meta);
   }

source/dnode/mnode/impl/src/mndStream.c

@@ -2798,7 +2798,7 @@ int32_t mndProcessConsensusInTmr(SRpcMsg *pMsg) {
         break;
       }
 
-      if (((now - pe->ts) >= 10 * 1000) && allSame) {
+      if (((now - pe->ts) >= 10 * 1000) || allSame) {
         mDebug("s-task:0x%x sendTs:%" PRId64 " wait %.2fs and all tasks have same checkpointId", pe->req.taskId,
                pe->req.startTs, (now - pe->ts) / 1000.0);
         if (chkId > pe->req.checkpointId) {

tests/README.md

@@ -252,6 +252,10 @@ cd scripts/tsdbComp && \
 ./testTsbs.sh 
 ```
 
+> [!NOTE]
+> 1. TSBS test is written in Golang, in order to run the test smoothly, a Go proxy in China is set in above script by default. If this is not what you want, please unset it with command `sed -i '/GOPROXY/d' /usr/local/src/tsbs/scripts/tsdbComp/installTsbsCommand.sh` before starting the test.
+> 2. To check your current Go proxy setting, please run `go env | grep GOPROXY`.
+
 ### 3.7.2 How to start client and server on different hosts?
 
 By default, both client and server will be started on the local host. To start the client and server on separate hosts, please follow steps below to configure `test.ini` before starting the test:

utils/test/c/tmq_write_raw_test.c

@@ -136,6 +136,13 @@ int buildDatabase(TAOS* pConn, TAOS_RES* pRes) {
   }
   taos_free_result(pRes);
 
+  pRes = taos_query(pConn, "alter table ct0 set tag t4=false");
+  if (taos_errno(pRes) != 0) {
+    printf("alter table ct0 set tag t4=false, reason:%s\n", taos_errstr(pRes));
+    return -1;
+  }
+  taos_free_result(pRes);
+
   return 0;
 }