[DSIP-68] Unify the table structure and table fields in backend and frontend ui sections #16544

SbloodyS · 2024-08-29T07:32:19Z

Purpose of the pull request

Brief change log

close #16515
close #16525

Add @DisableIfTestFails annotation to e2e-test and api-test to the test class, all tests after the first failed one are disabled for better debugging. Junit
Schema-check CI improvement

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:

(or)

Pull Request Notice

If your pull request contain incompatible change, you should also add it to docs/docs/en/guide/upgrede/incompatible.md

...er-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java

...in/java/org/apache/dolphinscheduler/service/expand/TimePlaceholderResolverExpandService.java

     * @return
     */
-    String timeFunctionExtension(Integer processInstanceId, String timeZone, String placeholderName);
+    String timeFunctionExtension(Integer workflowInstanceId, String timeZone, String placeholderName);


...in/java/org/apache/dolphinscheduler/service/expand/TimePlaceholderResolverExpandService.java

     * @return
     */
-    String timeFunctionExtension(Integer processInstanceId, String timeZone, String placeholderName);
+    String timeFunctionExtension(Integer workflowInstanceId, String timeZone, String placeholderName);


...in/java/org/apache/dolphinscheduler/service/expand/TimePlaceholderResolverExpandService.java

     * @return
     */
-    String timeFunctionExtension(Integer processInstanceId, String timeZone, String placeholderName);
+    String timeFunctionExtension(Integer workflowInstanceId, String timeZone, String placeholderName);


...heduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java

-        for (String strProcessInstanceId : processInstanceIdArray) {
-            int processInstanceId = Integer.parseInt(strProcessInstanceId);
+        for (String strWorkflowInstanceId : workflowInstanceIdArray) {
+            int workflowInstanceId = Integer.parseInt(strWorkflowInstanceId);


...heduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java

-                execService.controlWorkflowInstance(loginUser, processInstanceId, executeType);
-                log.info("Success do action {} on workflowInstance: {}", executeType, processInstanceId);
+                execService.controlWorkflowInstance(loginUser, workflowInstanceId, executeType);
+                log.info("Success do action {} on workflowInstance: {}", executeType, workflowInstanceId);


...heduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java

+                errorMessage.add("Failed do action " + executeType + " on workflowInstance: " + workflowInstanceId
                        + "reason: " + e.getMessage());
-                log.error("Failed do action {} on workflowInstance: {}, error: {}", executeType, processInstanceId, e);
+                log.error("Failed do action {} on workflowInstance: {}, error: {}", executeType, workflowInstanceId, e);


...api/src/main/java/org/apache/dolphinscheduler/api/controller/WorkflowInstanceController.java

-            for (String strProcessInstanceId : processInstanceIdArray) {
-                int processInstanceId = Integer.parseInt(strProcessInstanceId);
+            for (String strWorkflowInstanceId : workflowInstanceIdArray) {
+                int workflowInstanceId = Integer.parseInt(strWorkflowInstanceId);


...api/src/main/java/org/apache/dolphinscheduler/api/controller/WorkflowInstanceController.java

+                    workflowInstanceService.deleteWorkflowInstanceById(loginUser, workflowInstanceId);
                } catch (Exception e) {
-                    log.error("Delete workflow instance: {} error", strProcessInstanceId, e);
+                    log.error("Delete workflow instance: {} error", strWorkflowInstanceId, e);


dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/DagDataSchedule.java

+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)


...src/main/java/org/apache/dolphinscheduler/api/dto/taskInstance/TaskInstanceQueryRequest.java

 /**
 * task instance request
 */
+@EqualsAndHashCode(callSuper = true)


zhongjiajie

Great 👍 , only have one issue I am not sure

.github/workflows/schema-check/postgresql/running-test.sh

docs/docs/zh/guide/upgrade/upgrade.md

ruanwenjun · 2024-09-04T10:31:45Z

dolphinscheduler-dao/src/main/resources/sql/upgrade/3.3.0_schema/mysql/dolphinscheduler_dml.sql

+
+UPDATE t_ds_task_definition SET task_type = 'SUB_WORKFLOW' WHERE task_type = 'SUB_PROCESS';
+UPDATE t_ds_task_definition_log SET task_type = 'SUB_WORKFLOW' WHERE task_type = 'SUB_PROCESS';
+UPDATE t_ds_task_definition SET task_params = replace(task_params, 'processDefinitionCode', 'workflowDefinitionCode') where task_type = 'SUB_WORKFLOW';


Also need to upgrade t_ds_task_definition_log.

And Dynamic task need to upgrade too.

ruanwenjun · 2024-09-04T10:32:42Z

...cheduler-dao/src/main/resources/sql/upgrade/3.3.0_schema/postgresql/dolphinscheduler_dml.sql

+
+UPDATE t_ds_task_definition SET task_type = 'SUB_WORKFLOW' WHERE task_type = 'SUB_PROCESS';
+UPDATE t_ds_task_definition_log SET task_type = 'SUB_WORKFLOW' WHERE task_type = 'SUB_PROCESS';
+UPDATE t_ds_task_definition SET task_params = replace(task_params, 'processDefinitionCode', 'workflowDefinitionCode') where task_type = 'SUB_WORKFLOW';


Same as above

sonarqubecloud · 2024-09-04T12:23:06Z

Quality Gate failed

Failed conditions
28.8% Coverage on New Code (required ≥ 60%)

See analysis details on SonarCloud

github-actions bot added backend test labels Aug 29, 2024

github-actions bot assigned SbloodyS Aug 29, 2024

github-advanced-security bot found potential problems Aug 29, 2024

View reviewed changes

...er-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java Fixed Show fixed Hide fixed

github-actions bot added the e2e e2e test label Aug 29, 2024

github-advanced-security bot found potential problems Aug 29, 2024

View reviewed changes

SbloodyS added this to the 3.3.0 milestone Aug 29, 2024

SbloodyS added improvement make more easy to user or prompt friendly DSIP labels Aug 29, 2024

SbloodyS marked this pull request as ready for review August 29, 2024 09:02

SbloodyS requested review from EricGao888, Gallardot, caishunfeng, ruanwenjun and zhuangchong as code owners August 29, 2024 09:02

SbloodyS marked this pull request as draft August 29, 2024 10:00

SbloodyS changed the title ~~[Improvement-16525] Unify the table structure and table fields in backend~~ [Improvement-16515] Unify the table structure and table fields in backend Aug 30, 2024

SbloodyS changed the title ~~[Improvement-16515] Unify the table structure and table fields in backend~~ [Improvement-16515] Unify the table structure and table fields in backend and frontend ui sections Aug 30, 2024

SbloodyS changed the title ~~[Improvement-16515] Unify the table structure and table fields in backend and frontend ui sections~~ [DSIP-68] Unify the table structure and table fields in backend and frontend ui sections Sep 2, 2024

SbloodyS force-pushed the improvement_16525 branch from 1d68dba to 7ffe0ef Compare September 2, 2024 07:30

github-actions bot added UI ui and front end related document labels Sep 2, 2024

github-advanced-security bot found potential problems Sep 2, 2024

View reviewed changes

github-actions bot added the CI&CD label Sep 3, 2024

SbloodyS marked this pull request as ready for review September 3, 2024 02:05

SbloodyS requested a review from songjianet as a code owner September 3, 2024 02:05

SbloodyS requested review from zhongjiajie and removed request for zhuangchong September 3, 2024 02:05

SbloodyS mentioned this pull request Sep 3, 2024

[Bug] [Api] WorkflowTaskLineage Param Passing Error #16570

Closed

3 tasks

SbloodyS linked an issue Sep 3, 2024 that may be closed by this pull request

[Bug] [Api] WorkflowTaskLineage Param Passing Error #16570

Closed

3 tasks

SbloodyS added 20 commits September 4, 2024 14:52

improvement 16525

c42c071

improvement 16525

e198e43

improvement 16525

c055ab8

improvement 16525

dc6f705

improvement 16525

cf0a8ba

improvement 16525

cbd1040

improvement 16525

bd8881a

improvement 16525

11b4097

improvement 16525

b1b2de7

improvement 16525

86f9e8f

improvement 16525

ae2b9d3

improvement 16525

5de353b

improvement 16525

1278f5c

improvement 16525

8e9f500

improvement 16525

06bd6bb

improvement 16525

8d1d70b

improvement 16525

5b8d1e2

improvement 16525

c64fb6b

improvement 16525

02c04d7

improvement 16525

6b50d70

SbloodyS force-pushed the improvement_16525 branch from 8686e31 to 6b50d70 Compare September 4, 2024 06:53

zhongjiajie previously approved these changes Sep 4, 2024

View reviewed changes

.github/workflows/schema-check/postgresql/running-test.sh Show resolved Hide resolved

docs/docs/zh/guide/upgrade/upgrade.md Show resolved Hide resolved

ruanwenjun reviewed Sep 4, 2024

View reviewed changes

improvement 16525

da8ae96

SbloodyS dismissed zhongjiajie’s stale review via da8ae96 September 4, 2024 11:51

ruanwenjun approved these changes Sep 4, 2024

View reviewed changes

zhongjiajie approved these changes Sep 4, 2024

View reviewed changes

SbloodyS merged commit fee4955 into apache:dev Sep 4, 2024

SbloodyS deleted the improvement_16525 branch September 4, 2024 13:22

[DSIP-68] Unify the table structure and table fields in backend and frontend ui sections #16544

[DSIP-68] Unify the table structure and table fields in backend and frontend ui sections #16544

Uh oh!

Conversation

SbloodyS commented Aug 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Purpose of the pull request

Brief change log

Verify this pull request

Pull Request Notice

Uh oh!

Uh oh!

Check notice

Check notice

Check notice

Check notice

Check failure

Check failure

Check notice

Check failure

Check notice

Check notice

zhongjiajie left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

ruanwenjun Sep 4, 2024

Choose a reason for hiding this comment

Uh oh!

SbloodyS Sep 4, 2024

Choose a reason for hiding this comment

Uh oh!

ruanwenjun Sep 4, 2024

Choose a reason for hiding this comment

Uh oh!

SbloodyS Sep 4, 2024

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Sep 4, 2024

Quality Gate failed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

SbloodyS commented Aug 29, 2024 •

edited

Loading