Merge branch 'main' of github.com:taosdata/TDengine into feat/TD-6690010183

Author: YamingPei

.github/workflows/new-framework-test.yml

@@ -46,6 +46,7 @@ concurrency:
 
 jobs:
   test-new-cases:
+    if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && !contains(github.event.pull_request.title, '[manual-only]'))
     uses: taosdata/.github/.github/workflows/new-framework-test.yml@main
     with:
       tdinternal: false

.github/workflows/taoskeeper-test.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - "main"
       - "3.0"
+      - "3.3.6"
       - "3.3.8"
     paths:
       - "tools/keeper/**"
@@ -14,6 +15,7 @@ on:
       - "main"
       - "3.0"
       - "3.3.6"
+      - "3.3.8"
     paths:
       - "tools/keeper/**"
       - ".github/workflows/taoskeeper*.yml"
@@ -42,9 +44,24 @@ jobs:
         with:
           cmakeVersion: 3.31.6
 
+      - name: Determine taosadapter git tag
+        id: taosadapter_tag
+        run: |
+          branch="${{ github.base_ref }}"
+          if [ -z "$branch" ]; then
+            branch="${{ github.ref_name }}"
+          fi
+          case "$branch" in
+            3.0) tag="3.0" ;;
+            3.3.6) tag="3.3.6" ;;
+            3.3.8) tag="3.3.8" ;;
+            *) tag="main" ;;
+          esac
+          echo "value=$tag" >> "$GITHUB_OUTPUT"
+
       - name: Install TDengine
         env:
-          TAOSADAPTER_FLAG: ${{ github.base_ref == '3.0' && '-DTAOSADAPTER_GIT_TAG:STRING=3.0' || '' }}
+          TAOSADAPTER_FLAG: -DTAOSADAPTER_GIT_TAG:STRING=${{ steps.taosadapter_tag.outputs.value }}
         run: |
           mkdir debug
           cd debug

build.bat

@@ -57,6 +57,7 @@ cmake -B debug -G "NMake Makefiles" ^
         -DBUILD_TEST=true ^
         -DWEBSOCKET=true ^
         -DBUILD_DEPENDENCY_TESTS=false ^
+        -DCMAKE_BUILD_TYPE=%TD_CONFIG% ^
         %*
 exit /B
 

docs/custom-rules/space-after-punctuation-in-emphasis.js

@@ -6,6 +6,40 @@ module.exports = [
     description: "Ensure there is a space after emphasis markers (**bold:** text) if the emphasized text ends with punctuation (e.g., :, ：, ;, ；, etc.) and is immediately followed by non-whitespace content.",
     tags: ["emphasis", "formatting"],
     function: function spaceAfterPunctuationInEmphasis(params, onError) {
+      function escapeRegExp(str) {
+        return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+      }
+
+      const punctuationRegex = /[：:；;,\.]$/;
+
+      function reportIfMissingSpace(lineContent, boldContent, lineNumber) {
+        if (!boldContent || !lineContent) return false;
+        const pattern = new RegExp("\\*\\*" + escapeRegExp(boldContent) + "\\*\\*", "g");
+        let m;
+        while ((m = pattern.exec(lineContent)) !== null) {
+          const afterBold = lineContent.slice(m.index + m[0].length);
+          if (!afterBold || afterBold.trim().length === 0 || afterBold.startsWith("**")) {
+            continue;
+          }
+          if (!afterBold.startsWith(" ")) {
+            const columnNumber = m.index + m[0].length + 1;
+            onError({
+              lineNumber: lineNumber,
+              detail: `Add a space after the closing emphasis markers (**), if the emphasis ends with punctuation. (Column: ${columnNumber})`,
+              context: lineContent.trim(),
+              fixInfo: {
+                editColumn: columnNumber,
+                deleteCount: 0,
+                insertText: " ",
+              },
+            });
+            return true;
+          }
+          return false;
+        }
+        return false;
+      }
+
       params.tokens.forEach((token) => {
         if (token.type === "inline" && token.children) {
           token.children.forEach((child, childIndex) => {
@@ -16,27 +50,11 @@ module.exports = [
 
               if (precedingToken && precedingToken.type === "text") {
                 const boldContent = precedingToken.content.trim();
-                const punctuationRegex = /[：:；;,\.]$/; // Match full-width and half-width punctuation at the end
 
                 if (punctuationRegex.test(boldContent)) {
                   if (!nextToken || nextToken.type !== "text" || !nextToken.content.startsWith(" ")) {
-                    const lineContent = params.lines[child.lineNumber - 1];
-                    const boldStartIndex = lineContent.indexOf(`**${boldContent}**`);
-                    const columnNumber = boldStartIndex + `**${boldContent}**`.length + 1;
-                    const afterBold = lineContent.slice(boldStartIndex + `**${boldContent}**`.length);
-
-                    if (afterBold && afterBold.trim().length > 0 && !afterBold.startsWith(" ")) {
-                      const columnNumber = boldStartIndex + `**${boldContent}**`.length + 1;
-                      onError({
-                        lineNumber: child.lineNumber || token.lineNumber,
-                        detail: `Add a space after the closing emphasis markers (**), if the emphasis ends with punctuation. (Column: ${columnNumber})`,
-                        context: lineContent.trim(),
-                        fixInfo: {
-                          editColumn: columnNumber, // Correctly specify the column for the edit
-                          insertText: " ", // Suggest inserting a space
-                        },
-                      });
-                    }
+                    const lineContent = params.lines[child.lineNumber - 1] || "";
+                    reportIfMissingSpace(lineContent, boldContent, child.lineNumber);
                   }
                 }
               }
@@ -46,31 +64,13 @@ module.exports = [
             if (child.type === "text" && child.content.includes("**")) {
               const regex = /\*\*(.*?)\*\*/g; // Match **bold** and extract content
               let match;
+              const lineContent = params.lines[child.lineNumber - 1] || "";
               while ((match = regex.exec(child.content)) !== null) {
                 const boldContent = match[1]; // Extract content inside ** **
-                const punctuationRegex = /[：:；;,\.]$/; // Match full-width and half-width punctuation at the end
-
+                if (!boldContent) continue;
                 if (punctuationRegex.test(boldContent)) {
-                  const remainingContent = child.content.slice(match.index + match[0].length);
-                  if (!remainingContent.startsWith(" ")) {
-                    const lineContent = params.lines[child.lineNumber - 1];
-                    const boldStartIndex = lineContent.indexOf(match[0]);
-                    const columnNumber = boldStartIndex + match[0].length + 1;
-                    const afterBold = lineContent.slice(boldStartIndex + `**${boldContent}**`.length);
-
-                    if (afterBold && afterBold.trim().length > 0 && !afterBold.startsWith(" ")) {
-                      const columnNumber = boldStartIndex + `**${boldContent}**`.length + 1;
-                      onError({
-                        lineNumber: child.lineNumber || token.lineNumber,
-                        detail: `Add a space after the closing emphasis markers (**), if the emphasis ends with punctuation. (Column: ${columnNumber})`,
-                        context: lineContent.trim(),
-                        fixInfo: {
-                          editColumn: columnNumber, // Correctly specify the column for the edit
-                          insertText: " ", // Suggest inserting a space
-                        },
-                      });
-                    }
-                  }
+                  // try to locate an applicable bold occurrence in the full line
+                  reportIfMissingSpace(lineContent, boldContent, child.lineNumber);
                 }
               }
             }

docs/en/04-get-started/03-package.md

@@ -6,7 +6,7 @@ slug: /get-started/deploy-from-package
 
 import Tabs from "@theme/Tabs";
 import TabItem from "@theme/TabItem";
-import PkgListV37 from "/components/PkgListV37";
+import PkgList from "/src/components/PkgList";
 import Getstarted from './_get_started.mdx';
 
 You can install TDengine TSDB Enterprise on Linux and Windows. To install TDengine TSDB in a Docker container instead of on your machine, see [Get Started with TDengine in Docker](../deploy-in-docker/).
@@ -22,7 +22,7 @@ You can install TDengine TSDB Enterprise on Linux and Windows. To install TDengi
 <TabItem label="Linux" value="linux">
 
 1. Download the tar.gz installation package from the list below:  
-   <PkgListV37 productName="TDengine TSDB-Enterprise" version="3.4.0.0" platform="Linux-Generic" pkgType="Server" />
+   <PkgList productName="TDengine TSDB-Enterprise" platform="Linux-Generic" />
 2. Navigate to the directory where the package is located and extract it using `tar`. For example, on an x64 architecture:  
 
    ```bash
@@ -40,7 +40,7 @@ You can install TDengine TSDB Enterprise on Linux and Windows. To install TDengi
 <TabItem label="Windows" value="windows">
 
 1. Download the Windows installation package from the list below:  
-   <PkgListV37 productName="TDengine TSDB-Enterprise" version="3.4.0.0" platform="Windows" pkgType="Server" />
+   <PkgList productName="TDengine TSDB-Enterprise" platform="Windows" />
 2. Run the installation package and follow the on-screen instructions to complete the installation of TDengine TSDB.
 
 </TabItem>

docs/en/06-advanced/06-tdgpt/02-tutorial.md

@@ -3,7 +3,7 @@ title: Installation
 sidebar_label: Installation
 ---
 
-import PkgListV3 from "/components/PkgListV3";
+import PkgList from "/src/components/PkgList";
 
 This section describes how to use TDgpt in Docker
 
@@ -31,7 +31,7 @@ docker pull tdengine/tdgpt:latest
 You can specify a version if desired:
 
 ```shell
-docker pull tdengine/tdgpt:3.3.7.0
+docker pull tdengine/tdgpt:3.3.8.0
 ```
 
 Start the container:
@@ -40,7 +40,7 @@ Start the container:
 docker run -d \
   -p 6035:6035 \
   -p 6036:6036 \
-  tdengine/tdgpt:3.3.7.0
+  tdengine/tdgpt:3.3.8.0
 ```
 
 :::note
@@ -60,13 +60,13 @@ docker pull tdengine/tdgpt-full:latest
 You can specify a version if desired:
 
 ```shell
-docker pull tdengine/tdgpt-full:3.3.7.0
+docker pull tdengine/tdgpt-full:3.3.8.0
 ```
 
 Start the container:
 
 ```shell
-docker run -d -p 6035:6035 -p 6036:6036 -p 6037:6037 tdengine/tdgpt-full:3.3.7.0
+docker run -d -p 6035:6035 -p 6036:6036 -p 6037:6037 tdengine/tdgpt-full:3.3.8.0
 ```
 
 Note: TDgpt runs on TCP port 6035. The standard image also uses port 6036, and the full image uses port 6037.
@@ -141,7 +141,7 @@ sudo apt install build-essential
 
 1. Download the tar.gz package from the list:
 
-   <PkgListV3 type={9}/>
+   <PkgList productName="TDengine TDgpt-OSS" platform="Linux-Generic" />
 
    This package contains the TDtsfm and Time-MoE foundation models for time series. Ensure that you have 16 GB of disk space available to store the models.
 

docs/en/07-develop/01-connect.md

@@ -115,7 +115,7 @@ If you are using Maven to manage your project, simply add the following dependen
     - Install a specific version
 
     ```shell
-    pip3 install taospy==2.8.6
+    pip3 install taospy==2.8.8
     ```
 
     - Install from GitHub

docs/en/07-develop/09-udf.md

@@ -241,7 +241,7 @@ To better operate the above data structures, some convenience functions are prov
 
 ### C UDF Example Code
 
-#### Scalar Function Example [bit_and](https://github.com/taosdata/TDengine/blob/3.0/test/cases/12-UDFs/sh/bit_and.c)
+#### Scalar Function Example
 
 `bit_and` implements the bitwise AND function for multiple columns. If there is only one column, it returns that column. `bit_and` ignores null values.
 
@@ -254,7 +254,7 @@ To better operate the above data structures, some convenience functions are prov
 
 </details>
 
-#### Aggregate Function Example 1 Returning Numeric Type [l2norm](https://github.com/taosdata/TDengine/blob/3.0/test/cases/12-UDFs/sh/l2norm.c)
+#### Aggregate Function Example 1: Returning Numeric Type
 
 `l2norm` implements the second-order norm of all data in the input columns, i.e., squaring each data point, then summing them up, and finally taking the square root.
 
@@ -267,7 +267,7 @@ To better operate the above data structures, some convenience functions are prov
 
 </details>
 
-#### Aggregate Function Example 2 Returning String Type [max_vol](https://github.com/taosdata/TDengine/blob/3.0/test/cases/12-UDFs/sh/max_vol.c)
+#### Aggregate Function Example 2: Returning String Type
 
 `max_vol` implements finding the maximum voltage from multiple input voltage columns, returning a composite string value consisting of the device ID + the position (row, column) of the maximum voltage + the maximum voltage value.
 
@@ -298,7 +298,7 @@ SELECT max_vol(vol1, vol2, vol3, deviceid) FROM battery;
 
 </details>
 
-#### Aggregate Function Example 3 Split string and calculate average value [extract_avg](https://github.com/taosdata/TDengine/blob/3.0/test/cases/12-UDFs/sh/extract_avg.c)
+#### Aggregate Function Example 3: Split String and Calculate Average Value
 
 The `extract_avg` function converts a comma-separated string sequence into a set of numerical values, counts the results of all rows, and calculates the final average. Note when implementing:
 
@@ -865,7 +865,7 @@ Through this example, we learned how to define aggregate functions and print cus
 
 ### More Python UDF Example Code
 
-#### Scalar Function Example [pybitand](https://github.com/taosdata/TDengine/blob/3.0/test/cases/12-UDFs/sh/pybitand.py)
+#### Scalar Function Example
 
 `pybitand` implements the bitwise AND function for multiple columns. If there is only one column, it returns that column. `pybitand` ignores null values.
 
@@ -878,7 +878,7 @@ Through this example, we learned how to define aggregate functions and print cus
 
 </details>
 
-#### Aggregate Function Example [pyl2norm](https://github.com/taosdata/TDengine/blob/3.0/test/cases/12-UDFs/sh/pyl2norm.py)
+#### Aggregate Function Example 1
 
 `pyl2norm` calculates the second-order norm of all data in the input column, i.e., squares each data point, then sums them up, and finally takes the square root.
 
@@ -891,7 +891,7 @@ Through this example, we learned how to define aggregate functions and print cus
 
 </details>
 
-#### Aggregate Function Example [pycumsum](https://github.com/taosdata/TDengine/blob/3.0/test/cases/12-UDFs/sh/pycumsum.py)
+#### Aggregate Function Example 2
 
 `pycumsum` uses numpy to calculate the cumulative sum of all data in the input column.