From 22cbe39c0536bb216b24b443ae60b7756f43311b Mon Sep 17 00:00:00 2001 From: Feng Chao Date: Sat, 15 Mar 2025 09:21:29 +0800 Subject: [PATCH 1/5] ci: update workflow to handle the two mode with different step --- .github/workflows/tdengine-test.yml | 57 +++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tdengine-test.yml b/.github/workflows/tdengine-test.yml index 1178e393e9..559c6ded97 100644 --- a/.github/workflows/tdengine-test.yml +++ b/.github/workflows/tdengine-test.yml @@ -17,9 +17,23 @@ on: - 'tests/parallel/tdgpt_cases.task' - 'tests/script/tsim/analytics' - '**/*.md' + workflow_dispatch: + inputs: + specified_source_branch: + description: 'Enter the source branch name of TDengine' + required: true + type: string + specified_target_branch: + description: 'Enter the target branch name of TDengine' + required: true + type: string + specified_pr_number: + description: 'Enter the PR number of TDengine' + required: true + type: string concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number }}-TDengine + group: ${{ github.workflow }}-${{ github.event.pull_request.number }}-${{ github.event.inputs.specified_target_branch }}-${{ github.event.inputs.specified_pr_number }}-TDengine cancel-in-progress: true env: @@ -28,17 +42,54 @@ env: jobs: run-tests-on-linux: uses: taosdata/.github/.github/workflows/run-tests-on-linux.yml@main + if: ${{ github.event_name == 'pull_request' }} with: tdinternal: false - run_function_test: true - run_tdgpt_test: false + specified_source_branch: 'unavailable' + specified_target_branch: 'unavailable' + specified_pr_number: 'unavailable' + + run-tests-on-linux-manually: + uses: taosdata/.github/.github/workflows/run-tests-on-linux.yml@main + if: ${{ github.event_name == 'workflow_dispatch' }} + with: + tdinternal: false + specified_source_branch: ${{ github.event.inputs.specified_source_branch }} + specified_target_branch: ${{ github.event.inputs.specified_target_branch }} + specified_pr_number: ${{ github.event.inputs.specified_pr_number }} run-tests-on-mac: uses: taosdata/.github/.github/workflows/run-tests-on-macos.yml@main + if: ${{ github.event_name == 'pull_request' }} with: tdinternal: false + specified_source_branch: 'unavailable' + specified_target_branch: 'unavailable' + specified_pr_number: 'unavailable' + + run-tests-on-mac-munually: + uses: taosdata/.github/.github/workflows/run-tests-on-macos.yml@main + if: ${{ github.event_name == 'workflow_dispatch' }} + with: + tdinternal: false + specified_source_branch: ${{ github.event.inputs.specified_source_branch }} + specified_target_branch: ${{ github.event.inputs.specified_target_branch }} + specified_pr_number: ${{ github.event.inputs.specified_pr_number }} run-tests-on-windows: uses: taosdata/.github/.github/workflows/run-tests-on-windows.yml@main + if: ${{ github.event_name == 'pull_request' }} with: tdinternal: false + specified_source_branch: 'unavailable' + specified_target_branch: 'unavailable' + specified_pr_number: 'unavailable' + + run-tests-on-windows-manually: + uses: taosdata/.github/.github/workflows/run-tests-on-windows.yml@main + if: ${{ github.event_name == 'workflow_dispatch' }} + with: + tdinternal: false + specified_source_branch: ${{ github.event.inputs.specified_source_branch }} + specified_target_branch: ${{ github.event.inputs.specified_target_branch }} + specified_pr_number: ${{ github.event.inputs.specified_pr_number }} From f1e3b0b9fcc388c3fca080b0b634ce802d68663a Mon Sep 17 00:00:00 2001 From: Feng Chao Date: Mon, 17 Mar 2025 15:46:11 +0800 Subject: [PATCH 2/5] ci: remove manual workflow --- .github/workflows/tdengine-test-manual.yml | 54 ---------------------- 1 file changed, 54 deletions(-) delete mode 100644 .github/workflows/tdengine-test-manual.yml diff --git a/.github/workflows/tdengine-test-manual.yml b/.github/workflows/tdengine-test-manual.yml deleted file mode 100644 index be14a6e908..0000000000 --- a/.github/workflows/tdengine-test-manual.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: TDengine Test (Manual) - -on: - workflow_dispatch: - inputs: - specified_source_branch: - description: 'Enter the source branch name of TDengine' - required: false - default: 'unavailable' - type: string - specified_target_branch: - description: 'Enter the target branch name of TDengine' - required: false - default: 'unavailable' - type: string - specified_pr_number: - description: 'Enter the PR number of TDengine' - required: false - default: 'unavailable' - type: string - -concurrency: - group: ${{ github.event.inputs.specified_target_branch }}-${{ github.event.inputs.specified_pr_number }}-TDengine - cancel-in-progress: true - -env: - WKC: '/var/lib/jenkins/workspace/TDinternal/community' - -jobs: - run-tests-on-linux: - uses: taosdata/.github/.github/workflows/run-tests-on-linux.yml@ci/test/workflow - with: - tdinternal: false - run_function_test: true - run_tdgpt_test: false - specified_source_branch: ${{ github.event.inputs.specified_source_branch }} - specified_target_branch: ${{ github.event.inputs.specified_target_branch }} - specified_pr_number: ${{ github.event.inputs.specified_pr_number }} - - run-tests-on-mac: - uses: taosdata/.github/.github/workflows/run-tests-on-macos.yml@ci/test/workflow - with: - tdinternal: false - specified_source_branch: ${{ github.event.inputs.specified_source_branch }} - specified_target_branch: ${{ github.event.inputs.specified_target_branch }} - specified_pr_number: ${{ github.event.inputs.specified_pr_number }} - - run-tests-on-windows: - uses: taosdata/.github/.github/workflows/run-tests-on-windows.yml@ci/test/workflow - with: - tdinternal: false - specified_source_branch: ${{ github.event.inputs.specified_source_branch }} - specified_target_branch: ${{ github.event.inputs.specified_target_branch }} - specified_pr_number: ${{ github.event.inputs.specified_pr_number }} From 37b5e24e49fb167311227274d05b1b89bf6fdf42 Mon Sep 17 00:00:00 2001 From: Feng Chao Date: Mon, 17 Mar 2025 16:36:50 +0800 Subject: [PATCH 3/5] ci: udpate input parameters and remove unusable step --- .github/workflows/tdengine-test.yml | 45 ++++++----------------------- 1 file changed, 9 insertions(+), 36 deletions(-) diff --git a/.github/workflows/tdengine-test.yml b/.github/workflows/tdengine-test.yml index 559c6ded97..086ca4a6b8 100644 --- a/.github/workflows/tdengine-test.yml +++ b/.github/workflows/tdengine-test.yml @@ -45,51 +45,24 @@ jobs: if: ${{ github.event_name == 'pull_request' }} with: tdinternal: false - specified_source_branch: 'unavailable' - specified_target_branch: 'unavailable' - specified_pr_number: 'unavailable' - - run-tests-on-linux-manually: - uses: taosdata/.github/.github/workflows/run-tests-on-linux.yml@main - if: ${{ github.event_name == 'workflow_dispatch' }} - with: - tdinternal: false - specified_source_branch: ${{ github.event.inputs.specified_source_branch }} - specified_target_branch: ${{ github.event.inputs.specified_target_branch }} - specified_pr_number: ${{ github.event.inputs.specified_pr_number }} + specified_source_branch: ${{ github.event_name == 'pull_request' && 'unavailable' || github.event.inputs.specified_source_branch }} + specified_target_branch: ${{ github.event_name == 'pull_request' && 'unavailable' || github.event.inputs.specified_target_branch }} + specified_pr_number: ${{ github.event_name == 'pull_request' && 'unavailable' || github.event.inputs.specified_pr_number }} run-tests-on-mac: uses: taosdata/.github/.github/workflows/run-tests-on-macos.yml@main if: ${{ github.event_name == 'pull_request' }} with: tdinternal: false - specified_source_branch: 'unavailable' - specified_target_branch: 'unavailable' - specified_pr_number: 'unavailable' - - run-tests-on-mac-munually: - uses: taosdata/.github/.github/workflows/run-tests-on-macos.yml@main - if: ${{ github.event_name == 'workflow_dispatch' }} - with: - tdinternal: false - specified_source_branch: ${{ github.event.inputs.specified_source_branch }} - specified_target_branch: ${{ github.event.inputs.specified_target_branch }} - specified_pr_number: ${{ github.event.inputs.specified_pr_number }} + specified_source_branch: ${{ github.event_name == 'pull_request' && 'unavailable' || github.event.inputs.specified_source_branch }} + specified_target_branch: ${{ github.event_name == 'pull_request' && 'unavailable' || github.event.inputs.specified_target_branch }} + specified_pr_number: ${{ github.event_name == 'pull_request' && 'unavailable' || github.event.inputs.specified_pr_number }} run-tests-on-windows: uses: taosdata/.github/.github/workflows/run-tests-on-windows.yml@main if: ${{ github.event_name == 'pull_request' }} with: tdinternal: false - specified_source_branch: 'unavailable' - specified_target_branch: 'unavailable' - specified_pr_number: 'unavailable' - - run-tests-on-windows-manually: - uses: taosdata/.github/.github/workflows/run-tests-on-windows.yml@main - if: ${{ github.event_name == 'workflow_dispatch' }} - with: - tdinternal: false - specified_source_branch: ${{ github.event.inputs.specified_source_branch }} - specified_target_branch: ${{ github.event.inputs.specified_target_branch }} - specified_pr_number: ${{ github.event.inputs.specified_pr_number }} + specified_source_branch: ${{ github.event_name == 'pull_request' && 'unavailable' || github.event.inputs.specified_source_branch }} + specified_target_branch: ${{ github.event_name == 'pull_request' && 'unavailable' || github.event.inputs.specified_target_branch }} + specified_pr_number: ${{ github.event_name == 'pull_request' && 'unavailable' || github.event.inputs.specified_pr_number }} From b5b0aa70d2240a332db22e6feec7210d770fd845 Mon Sep 17 00:00:00 2001 From: Zhiyu Yang <69311263+zyyang90@users.noreply.github.com> Date: Mon, 17 Mar 2025 18:06:05 +0800 Subject: [PATCH 4/5] docs(opcda): support {id} in tbname#TS-5785 (#30026) --- docs/zh/06-advanced/05-data-in/06-opcda.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/zh/06-advanced/05-data-in/06-opcda.md b/docs/zh/06-advanced/05-data-in/06-opcda.md index 93ce0ba15a..7ddbaf6f03 100644 --- a/docs/zh/06-advanced/05-data-in/06-opcda.md +++ b/docs/zh/06-advanced/05-data-in/06-opcda.md @@ -97,7 +97,6 @@ CSV 文件中的每个 Row 配置一个 OPC 数据点位。Row 的规则如下 (1) 与 Header 中的列有如下对应关系 - | 序号 | Header 中的列 | 值的类型 | 值的范围 | 是否必填 | 默认值 | |----|-------------------------| -------- |----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|--------------| | 1 | tag_name | String | 类似`root.parent.temperature`这样的字符串，要满足 OPC DA 的 ID 规范 | 是 | | From 38e192be71b7cf53f5729f531f890d2ef1212c84 Mon Sep 17 00:00:00 2001 From: haoranchen Date: Mon, 17 Mar 2025 21:42:07 +0800 Subject: [PATCH 5/5] docs(zh): update multi.md to correct math formatting to text (#30214) --- docs/zh/08-operation/12-multi.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/zh/08-operation/12-multi.md b/docs/zh/08-operation/12-multi.md index 6d698d9044..1a12225862 100644 --- a/docs/zh/08-operation/12-multi.md +++ b/docs/zh/08-operation/12-multi.md @@ -127,8 +127,8 @@ s3migrate database ; 当 TSDB 时序数据超过 `s3_keeplocal` 参数指定的时间，相关的数据文件会被切分成多个文件块，每个文件块的默认大小是 512M 字节 (`s3_chunkpages * tsdb_pagesize`)。除了最后一个文件块保留在本地文件系统外，其余的文件块会被上传到对象存储服务。 -```math -上传次数 = 数据文件大小 / (s3_chunkpages * tsdb_pagesize) - 1 +```text +上传次数 = 数据文件大小 / (s3_chunkpages * tsdb_pagesize) - 1 ``` 在创建数据库时，可以通过 `s3_chunkpages` 参数调整每个文件块的大小，从而控制每个数据文件的上传次数。 @@ -141,7 +141,7 @@ s3migrate database ; 相邻的多个数据页会作为一个数据块从对象存储下载一次，以减少从对象存储下载的次数。每个数据页的大小，在创建数据库时，通过 `tsdb_pagesize` 参数指定，默认 4K 字节。 -```math +```text 下载次数 = 查询需要的数据块数量 - 已缓存的数据块数量 ```