Skip to content

Commit 74810b5

Browse files
EricGao888EricGao888
authored
Merge 6177ae8 into ba53806 
2 parents ba53806 + 6177ae8 commit 74810b5

File tree

948 files changed

+5901
-4732
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

948 files changed

+5901
-4732
lines changed

‎docs/docs/en/about/glossary.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ there are no subsequent nodes. Examples are as follows:
1717
manual start or scheduled scheduling. Each time the process definition runs, a process instance is generated
1818

1919
**Task instance**: The task instance is the instantiation of the task node in the process definition, which identifies
20-
the specific task
20+
the specific task
2121

2222
**Task type**: Currently supports SHELL, SQL, SUB_PROCESS (sub-process), PROCEDURE, MR, SPARK, PYTHON, DEPENDENT (
2323
depends), and plans to support dynamic plug-in expansion, note: **SUB_PROCESS** need relation with another workflow definition which also a separate process

‎docs/docs/en/about/hardware.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,5 @@ DolphinScheduler provides the following network port configurations for normal o
4949
The minimum supported version of Google Chrome is version 85, but version 90 or above is recommended.
5050

5151
## Synchronize clocks
52-
To avoid problems with internal cluster communications that can impact your task execution, make sure that the clocks on all of the cluster nodes are synchronized from a common clock source, such as using Chrony and/or NTP. Synchronizing the time ensures that every node in the cluster has the same time.
52+
53+
To avoid problems with internal cluster communications that can impact your task execution, make sure that the clocks on all of the cluster nodes are synchronized from a common clock source, such as using Chrony and/or NTP. Synchronizing the time ensures that every node in the cluster has the same time.

‎docs/docs/en/contribute/join/become-a-committer.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ In Dolphinscheduler, **new committer nomination** could only be officially start
2020

2121
The following steps are recommended (to be initiated only by an existing PMC member):
2222
1. Send an email titled `[DISCUSS] Promote xxx as new committer` to `[email protected]`. List the important contributions of the candidate,
23-
so you could gather support from other PMC members for your proposal.
23+
so you could gather support from other PMC members for your proposal.
2424
2. Keep the discussion open for more than 3 days but no more than 1 week, unless there is any express objection or concern.
2525
3. If the PMC generally agrees to the proposal, send an email titled `[VOTE] Promote xxx as new committer` to `[email protected]`.
2626
4. Keep the voting process open for more than 3 days, but no more than 1 week. Consider the result as `Consensus Approval` if there are `3 + 1` votes with `NO` vetos. Please note that +1 votes > -1 votes.
@@ -31,6 +31,7 @@ The following steps are recommended (to be initiated only by an existing PMC mem
3131
The PMC member who starts the promotion is responsible for sending an invitation to the new committer and guiding him/her to set up the ASF env.
3232

3333
The PMC member should send an email using the following template to the new committer:
34+
3435
```
3536
To: <invitee name>@gmail.com
3637
Cc: [email protected]

‎docs/docs/en/guide/datasource/oracle.md‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44

55
## Datasource Parameters
66

7-
| **Datasource** | **Description** |
8-
|-------------------------|---------------------------------------------------------------------------------------------------------------------------------------------|
9-
| Datasource | Select Oracle. |
10-
| Datasource Name | Enter the name of the datasource. |
11-
| Description | Enter a description of the datasource. |
12-
| IP/Host Name | Enter the Oracle service IP. |
13-
| Port | Enter the Oracle service port. |
14-
| Username | Set the username for Oracle connection. |
15-
| Password | Set the password for Oracle connection. |
16-
| Database Name | Enter the ServiceName or SID of the Oracle connection. |
17-
| ServiceName or SID | Choose ServiceName or SID according to your entry in Database Name column. |
18-
| jdbc connect parameters | Parameter settings for Oracle connection, in JSON format. For example, you can use {"schema": "abc"} to specify database abc for using. |
7+
| **Datasource** | **Description** |
8+
|-------------------------|-----------------------------------------------------------------------------------------------------------------------------------------|
9+
| Datasource | Select Oracle. |
10+
| Datasource Name | Enter the name of the datasource. |
11+
| Description | Enter a description of the datasource. |
12+
| IP/Host Name | Enter the Oracle service IP. |
13+
| Port | Enter the Oracle service port. |
14+
| Username | Set the username for Oracle connection. |
15+
| Password | Set the password for Oracle connection. |
16+
| Database Name | Enter the ServiceName or SID of the Oracle connection. |
17+
| ServiceName or SID | Choose ServiceName or SID according to your entry in Database Name column. |
18+
| jdbc connect parameters | Parameter settings for Oracle connection, in JSON format. For example, you can use {"schema": "abc"} to specify database abc for using. |
1919

2020
## Native Supported
2121

‎docs/docs/en/guide/installation/standalone.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
Standalone only for quick experience for DolphinScheduler.
44

5-
If you are a newbie and want to experience DolphinScheduler functions, we recommend you install follow [Standalone deployment](standalone.md).
6-
If you want to experience more complete functions and schedule massive tasks, we recommend you install follow [pseudo-cluster deployment](pseudo-cluster.md).
5+
If you are a newbie and want to experience DolphinScheduler functions, we recommend you install follow [Standalone deployment](standalone.md).
6+
If you want to experience more complete functions and schedule massive tasks, we recommend you install follow [pseudo-cluster deployment](pseudo-cluster.md).
77
If you want to deploy DolphinScheduler in production, we recommend you follow [cluster deployment](cluster.md) or [Kubernetes deployment](kubernetes.md).
88

99
> **_Note:_** Standalone only recommends the usage of fewer than 20 workflows, because it uses in-memory H2 Database in default, ZooKeeper Testing Server, too many tasks may cause instability.

‎docs/docs/en/guide/upgrade/incompatible.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ This document records the incompatible updates between each version. You need to
1111

1212
* Copy and import workflow without 'copy' suffix [#10607](https://github.com/apache/dolphinscheduler/pull/10607)
1313
* Use semicolon as default sql segment separator [#10869](https://github.com/apache/dolphinscheduler/pull/10869)
14+

‎docs/docs/zh/about/hardware.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,5 @@ DolphinScheduler正常运行提供如下的网络端口配置：
4747
DolphinScheduler 推荐 Chrome 以及使用 Chromium 内核的较新版本浏览器访问前端可视化操作界面
4848

4949
## 时钟同步
50-
为避免可能影响任务执行的内部集群通信问题，请确保所有集群节点上的时钟与公共时钟源同步，例如使用 Chrony 和/或 NTP。 同步时间确保集群中的每个节点都有相同的时间
50+
51+
为避免可能影响任务执行的内部集群通信问题，请确保所有集群节点上的时钟与公共时钟源同步，例如使用 Chrony 和/或 NTP。 同步时间确保集群中的每个节点都有相同的时间

‎docs/docs/zh/contribute/join/become-a-committer.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ PMC会定期基于活跃贡献者们对Dolphinscheduler的贡献从他们中提
2828
发起提名的PMC成员负责向新的committer发出邀请，并指导他/她建立ASF精神思想。
2929

3030
PMC成员应使用以下模板向新的committer发送一封电子邮件:
31+
3132
```
3233
To: <invitee name>@gmail.com
3334
Cc: [email protected]

‎docs/docs/zh/guide/datasource/oracle.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@
1212
- 数据库名：输入连接 ORACLE 的 ServiceName 或 SID
1313
- Jdbc 连接参数：用于 ORACLE 连接的参数设置，以 JSON 形式填写
1414
- 比如 `{"schema": "abc"}` 指定使用 `username` 用户下的 `abc` 数据库
15+

‎docs/docs/zh/guide/parameter/built-in.md‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -29,33 +29,34 @@
2929

3030
- 也可以通过以下两种方式：
3131

32-
1.使用add_months()函数，该函数用于加减月份，
33-
第一个入口参数为[yyyyMMdd]，表示返回时间的格式
34-
第二个入口参数为月份偏移量，表示加减多少个月
35-
* 后 N 年：$[add_months(yyyyMMdd,12*N)]
36-
* 前 N 年：$[add_months(yyyyMMdd,-12*N)]
37-
* 后 N 月：$[add_months(yyyyMMdd,N)]
38-
* 前 N 月：$[add_months(yyyyMMdd,-N)]
39-
*******************************************
40-
2.直接加减数字
41-
在自定义格式后直接“+/-”数字
42-
* 后 N 周：$[yyyyMMdd+7*N]
43-
* 前 N 周：$[yyyyMMdd-7*N]
44-
* 后 N 天：$[yyyyMMdd+N]
45-
* 前 N 天：$[yyyyMMdd-N]
46-
* 后 N 小时：$[HHmmss+N/24]
47-
* 前 N 小时：$[HHmmss-N/24]
48-
* 后 N 分钟：$[HHmmss+N/24/60]
49-
* 前 N 分钟：$[HHmmss-N/24/60]
50-
*******************************************
51-
3.业务属性方式
52-
在自定义格式后直接“+/-”数字
53-
支持日志格式：所有日期表达式，例如：yyyy-MM-dd/yyyyMMddHHmmss
54-
* 当天：$[this_day(yyyy-MM-dd)]，如：2022-08-26 => 2022-08-26
55-
* 昨天：$[last_day(yyyy-MM-dd)]，如：2022-08-26 => 2022-08-25
56-
* 年的第N周，以周一为起点：$[year_week(yyyy-MM-dd)]，如：2022-08-26 => 2022-34
57-
* 年的第N周，以周N为起点：$[year_week(yyyy-MM-dd,N)]，如：N=5时 2022-08-26 => 2022-35
58-
* 前(-)/后(+) N 月第一天：$[month_first_day(yyyy-MM-dd,-N)]，如：N=1时 2022-08-26 => 2022-07-01
59-
* 前(-)/后(+) N 月最后一天：$[month_last_day(yyyy-MM-dd,-N)]，如：N=1时 2022-08-28 => 2022-07-31
60-
* 前(-)/后(+) N 周的周一：$[week_first_day(yyyy-MM-dd,-N)]，如：N=1 2022-08-26 => 2022-08-15
61-
* 前(-)/后(+) N 周的周日：$[week_last_day(yyyy-MM-dd,-N)]，如：N=1 2022-08-26 => 2022-08-21
32+
1.使用add_months()函数，该函数用于加减月份，
33+
第一个入口参数为[yyyyMMdd]，表示返回时间的格式
34+
第二个入口参数为月份偏移量，表示加减多少个月
35+
* 后 N 年：$[add_months(yyyyMMdd,12*N)]
36+
* 前 N 年：$[add_months(yyyyMMdd,-12*N)]
37+
* 后 N 月：$[add_months(yyyyMMdd,N)]
38+
* 前 N 月：$[add_months(yyyyMMdd,-N)]
39+
*******************************************
40+
2.直接加减数字
41+
在自定义格式后直接“+/-”数字
42+
* 后 N 周：$[yyyyMMdd+7*N]
43+
* 前 N 周：$[yyyyMMdd-7*N]
44+
* 后 N 天：$[yyyyMMdd+N]
45+
* 前 N 天：$[yyyyMMdd-N]
46+
* 后 N 小时：$[HHmmss+N/24]
47+
* 前 N 小时：$[HHmmss-N/24]
48+
* 后 N 分钟：$[HHmmss+N/24/60]
49+
* 前 N 分钟：$[HHmmss-N/24/60]
50+
*******************************************
51+
3.业务属性方式
52+
在自定义格式后直接“+/-”数字
53+
支持日志格式：所有日期表达式，例如：yyyy-MM-dd/yyyyMMddHHmmss
54+
* 当天：$[this_day(yyyy-MM-dd)]，如：2022-08-26 => 2022-08-26
55+
* 昨天：$[last_day(yyyy-MM-dd)]，如：2022-08-26 => 2022-08-25
56+
* 年的第N周，以周一为起点：$[year_week(yyyy-MM-dd)]，如：2022-08-26 => 2022-34
57+
* 年的第N周，以周N为起点：$[year_week(yyyy-MM-dd,N)]，如：N=5时 2022-08-26 => 2022-35
58+
* 前(-)/后(+) N 月第一天：$[month_first_day(yyyy-MM-dd,-N)]，如：N=1时 2022-08-26 => 2022-07-01
59+
* 前(-)/后(+) N 月最后一天：$[month_last_day(yyyy-MM-dd,-N)]，如：N=1时 2022-08-28 => 2022-07-31
60+
* 前(-)/后(+) N 周的周一：$[week_first_day(yyyy-MM-dd,-N)]，如：N=1 2022-08-26 => 2022-08-15
61+
* 前(-)/后(+) N 周的周日：$[week_last_day(yyyy-MM-dd,-N)]，如：N=1 2022-08-26 => 2022-08-21
62+

0 commit comments

Comments
 (0)