Add example and notice about task type Stored Procedure #9651

hstdream · 2022-04-21T09:02:15Z

Purpose of the pull request

this pr close: #8019

Brief change log

Verify this pull request

This pull request is code cleanup without any test coverage.

(or)

This pull request is already covered by existing tests, such as (please describe tests).

(or)

This change added tests and can be verified as follows:

hstdream · 2022-04-21T10:53:36Z

this pr close: #8019

zhongjiajie

BTW, please use the English screenshot instead of Chinese one

zhongjiajie · 2022-04-22T02:08:41Z

docs/docs/zh/guide/task/stored-procedure.md

+- 运行标志：标识这个结点是否能正常调度，如果不需要执行，可以打开禁止执行开关。
+- 描述：描述该节点的功能。
+- 任务优先级：worker 线程数不足时，根据优先级从高到低依次执行，优先级一样时根据先进先出原则执行。
+- Worker 分组：任务分配给 worker 组的机器执行，选择Default，会随机选择一台 worker 机执行。


Your Chinese docs should also use the highlight as English Default, just like your doc in English.

docs/configs/docsdev.js

zhongjiajie · 2022-04-22T02:22:06Z

docs/docs/en/guide/task/stored-procedure.md

you should change the document like https://github.com/apache/dolphinscheduler/blob/dev/docs/docs/en/guide/task/sql.md. We have section Overview and section Create DataSource

https://raw.githubusercontent.com/apache/dolphinscheduler/dev/docs/docs/en/guide/task/sql.md @hstdream

zhongjiajie · 2022-04-22T02:23:14Z

docs/docs/en/guide/task/stored-procedure.md

+- Delayed execution time: The time (unit minute) that a task delays in execution.
+- Timeout alarm: Check the timeout alarm and timeout failure. When the task runs exceed the "timeout", an alarm email will send and the task execution will fail.
+- DataSource: The DataSource type of the stored procedure supports MySQL,POSTGRESQL,HIVE,SPARK,CLICKHOUSE,ORACLE,SQLSERVER,DB2 and PRESTO, select the corresponding DataSource.


Suggested change

- DataSource: The DataSource type of the stored procedure supports MySQL,POSTGRESQL,HIVE,SPARK,CLICKHOUSE,ORACLE,SQLSERVER,DB2 and PRESTO, select the corresponding DataSource.

- DataSource: The DataSource type of the stored procedure supports MySQL,POSTGRESQL,HIVE,SPARK,CLICKHOUSE,ORACLE,SQLSERVER,DB2 and PRESTO.

caishunfeng · 2022-05-05T07:31:19Z

@hstdream Please resolve conflicts.

This reverts commit bb15df7.

This reverts commit 4246b77.

This reverts commit 7078a24.

zhongjiajie

I think we should also add ## Notice section to notice users they could only call Stored Procedure in this task, if they want to call Stored function, they should use SQL task
Please change your screenshot from Chinese to English

zhongjiajie · 2022-05-16T03:22:41Z

docs/docs/en/guide/task/stored-procedure.md

@@ -1,4 +1,10 @@
-# Stored Procedure
+# PROCEDURE


Suggested change

# PROCEDURE

# Procedure

zhongjiajie · 2022-05-16T03:25:41Z

docs/docs/zh/guide/task/stored-procedure.md

+`PROCEDURE` 任务类型，用于执行存储过程的程序
+
+## 创建任务
+
 - 根据选择的数据源，执行存储过程。
 > 拖动工具栏中的![PNG](https://analysys.github.io/easyscheduler_docs_cn/images/toolbar_PROCEDURE.png)任务节点到画板中，如下图所示：


Please change this png link from analysys.github.io to our local file like you add then in its Task Example section

zhongjiajie · 2022-05-16T03:28:51Z

docs/configs/docsdev.js

@@ -470,7 +470,7 @@ export default {
                                link: '/zh-cn/docs/dev/user_doc/guide/task/dependent.html',
                            },
                            {
-                                title: 'Stored Procedure',
+                                title: 'Procedure,
                                link: '/zh-cn/docs/dev/user_doc/guide/task/stored-procedure.html',


I suggest we should change the task file name from stored-procedure to procedure to keep the file name same as the content title of first line

Suggested change

link: '/zh-cn/docs/dev/user_doc/guide/task/stored-procedure.html',

link: '/zh-cn/docs/dev/user_doc/guide/task/procedure.html',

Please also change the EN document

zhongjiajie · 2022-05-16T03:29:00Z

docs/docs/en/guide/task/stored-procedure.md

+
+`PROCEDURE` task type, the program used to execute the stored procedure
+
+## Create Task

 - Execute the stored procedure according to the selected DataSource.


We should also add how to create task like others - Drag from the toolbar <img src="/img/tasks/icons/procedure.png" width="25"/> to the canvas.

# Conflicts: # docs/configs/docsdev.js

zhongjiajie · 2022-05-19T06:18:49Z

@hstdream CI failed, it is seem your have some unused imgs, and some deadlink in your change

codecov-commenter · 2022-05-30T02:46:02Z

Codecov Report

Merging #9651 (22f7240) into dev (7bf49a7) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##                dev    #9651   +/-   ##
=========================================
  Coverage     38.56%   38.56%           
+ Complexity     4080     4077    -3     
=========================================
  Files          1021     1021           
  Lines         38264    38264           
  Branches       4392     4394    +2     
=========================================
  Hits          14756    14756           
  Misses        21784    21784           
  Partials       1724     1724

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

zhongjiajie · 2022-05-30T07:47:58Z

Hi @hstdream CI still failed, you should remove the images '/img/tasks/demo/procedure_task1.png', '/img/procedure-en.png', '/img/procedure_edit.png', '/img/tasks/demo/procedure_task2.png' in img directory.

And change the screenshot docs/img/tasks/demo/procedure_task01.png docs/img/tasks/demo/procedure_task02.png language from Chinese to English

� Conflicts: � docs/docs/en/guide/task/stored-procedure.md � docs/docs/zh/guide/task/stored-procedure.md

zhongjiajie

Thanks for your contribution, but please switch dolphinscheduler language to English for the screenshot, we only accept English version

caishunfeng · 2023-02-02T03:16:52Z

I close this pr due to already implemented in dev branch.

SbloodyS requested a review from zhongjiajie April 21, 2022 09:54

SbloodyS assigned hstdream Apr 21, 2022

SbloodyS added the first time contributor First-time contributor label Apr 21, 2022

zhongjiajie reviewed Apr 22, 2022

View reviewed changes

zhongjiajie added the document label Apr 22, 2022

zhongjiajie reviewed Apr 22, 2022

View reviewed changes

zhongjiajie added the Waiting for user feedback Waiting for feedback from issue/PR author label Apr 26, 2022

houshitao added 6 commits April 26, 2022 22:20

Failed to rerun the workflow instance

7078a24

Failed to rerun the workflow instance

4246b77

Failed to rerun the workflow instance

bb15df7

Add example and notice about task type Stored Procedure

29f6f37

Add example and notice about task type Stored Procedure

34ef03f

Add example and notice about task type Stored Procedure

2f19f34

hstdream closed this May 5, 2022

hstdream force-pushed the dev branch from 32852a4 to 52b188b Compare May 5, 2022 12:37

zhongjiajie reopened this May 5, 2022

houshitao and others added 6 commits May 5, 2022 20:44

Revert "Failed to rerun the workflow instance"

2cf7cc7

This reverts commit bb15df7.

Revert "Failed to rerun the workflow instance"

25d2125

This reverts commit 4246b77.

Revert "Failed to rerun the workflow instance"

b16fd43

This reverts commit 7078a24.

Merge branch 'apache:dev' into dev

b12bee6

Merge branch 'apache:dev' into dev

a6b9996

Merge branch 'apache:dev' into dev

f7cd509

hstdream requested a review from Tianqi-Dotes as a code owner May 16, 2022 02:24

houshitao and others added 4 commits May 16, 2022 11:14

Add example and notice about task type Stored Procedure

ad1d899

Merge remote-tracking branch 'origin/dev' into dev

e1118f0

Update docs/configs/docsdev.js

7496f5b

Update docs/configs/docsdev.js

72632cd

zhongjiajie reviewed May 16, 2022

View reviewed changes

houshitao and others added 5 commits May 16, 2022 14:26

Add example and notice about task type Stored Procedure

5294e89

Merge remote-tracking branch 'origin/dev' into dev

daaf334

# Conflicts: # docs/configs/docsdev.js

Add example and notice about task type Stored Procedure

ee9a6c1

Merge branch 'apache:dev' into dev

1cb6893

Merge branch 'apache:dev' into dev

c529683

Merge branch 'apache:dev' into dev

e7752c7

houshitao and others added 2 commits June 10, 2022 06:16

Merge branch 'dev' of github.com:apache/dolphinscheduler into dev

24582ca

� Conflicts: � docs/docs/en/guide/task/stored-procedure.md � docs/docs/zh/guide/task/stored-procedure.md

Merge branch 'apache:dev' into dev

1ec1e9b

hstdream requested a review from EricGao888 as a code owner September 28, 2022 01:30

hstdream added 2 commits September 30, 2022 09:43

Merge branch 'apache:dev' into dev

9b716be

Merge branch 'apache:dev' into dev

22f7240

zhongjiajie reviewed Oct 10, 2022

View reviewed changes

caishunfeng closed this Feb 2, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add example and notice about task type Stored Procedure #9651

Add example and notice about task type Stored Procedure #9651

hstdream commented Apr 21, 2022 •

edited by SbloodyS

Loading

hstdream commented Apr 21, 2022

zhongjiajie left a comment

zhongjiajie Apr 22, 2022

zhongjiajie Apr 26, 2022

zhongjiajie Apr 22, 2022

zhongjiajie Apr 26, 2022

zhongjiajie Apr 22, 2022

caishunfeng commented May 5, 2022

zhongjiajie left a comment

zhongjiajie May 16, 2022

zhongjiajie May 16, 2022

zhongjiajie May 16, 2022

zhongjiajie May 16, 2022

zhongjiajie May 16, 2022

zhongjiajie commented May 19, 2022

codecov-commenter commented May 30, 2022 •

edited

Loading

zhongjiajie commented May 30, 2022 •

edited

Loading

zhongjiajie left a comment

caishunfeng commented Feb 2, 2023

	- DataSource: The DataSource type of the stored procedure supports MySQL,POSTGRESQL,HIVE,SPARK,CLICKHOUSE,ORACLE,SQLSERVER,DB2 and PRESTO, select the corresponding DataSource.
	- DataSource: The DataSource type of the stored procedure supports MySQL,POSTGRESQL,HIVE,SPARK,CLICKHOUSE,ORACLE,SQLSERVER,DB2 and PRESTO.

	link: '/zh-cn/docs/dev/user_doc/guide/task/stored-procedure.html',
	link: '/zh-cn/docs/dev/user_doc/guide/task/procedure.html',

Add example and notice about task type Stored Procedure #9651

Add example and notice about task type Stored Procedure #9651

Conversation

hstdream commented Apr 21, 2022 • edited by SbloodyS Loading

Purpose of the pull request

Brief change log

Verify this pull request

hstdream commented Apr 21, 2022

zhongjiajie left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

caishunfeng commented May 5, 2022

zhongjiajie left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zhongjiajie commented May 19, 2022

codecov-commenter commented May 30, 2022 • edited Loading

Codecov Report

zhongjiajie commented May 30, 2022 • edited Loading

zhongjiajie left a comment

Choose a reason for hiding this comment

caishunfeng commented Feb 2, 2023

hstdream commented Apr 21, 2022 •

edited by SbloodyS

Loading

codecov-commenter commented May 30, 2022 •

edited

Loading

zhongjiajie commented May 30, 2022 •

edited

Loading