Skip to content

[fix-#14537] the branch that needs to be executed overlaps with another branch, it may not be able to complete the normal execution #14563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
ruanwenjun merged 5 commits into from
Aug 1, 2023
Merged

[fix-#14537] the branch that needs to be executed overlaps with another branch, it may not be able to complete the normal execution #14563

ruanwenjun merged 5 commits into from
Aug 1, 2023

Conversation

@fuchanghai
Copy link
Member

@fuchanghai fuchanghai commented Jul 17, 2023 •
edited
Loading

plz close #14537

Purpose of the pull request

Only skip the non-common part before the first intersection of the branch executed by the switch and the non-executed branch

Brief change log

nodes behind the red box are not executed
before:
image

after:
image

Verify this pull request

This pull request is code cleanup without any test coverage.

@fuchanghai fuchanghai requested a review from caishunfeng as a code owner July 17, 2023 01:49
@codecov-commenter
Copy link

codecov-commenter commented Jul 17, 2023 •
edited
Loading

Codecov Report

Merging #14563 (dbf19a0) into dev (150d9e0) will decrease coverage by 0.01%.
Report is 1 commits behind head on dev.
The diff coverage is 54.16%.

❗ Current head dbf19a0 differs from pull request most recent head c537dea. Consider uploading reports for the commit c537dea to get more accurate results

@@             Coverage Diff              @@
##                dev   #14563      +/-   ##
============================================
- Coverage     38.66%   38.66%   -0.01%     
  Complexity     4623     4623              
============================================
  Files          1284     1284              
  Lines         43877    43900      +23     
  Branches       4846     4852       +6     
============================================
+ Hits          16967    16973       +6     
- Misses        25033    25045      +12     
- Partials       1877     1882       +5
Files Changed Coverage Δ
...ache/dolphinscheduler/service/utils/DagHelper.java 56.42% <54.16%> (+<0.01%) ⬆️

... and 5 files with indirect coverage changes

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

@fuchanghai
Copy link
Member Author

fuchanghai commented Jul 17, 2023

PTAL @caishunfeng cc @Radeity @EricGao888

@SbloodyS SbloodyS added bug Something isn't working 3.2.0 for 3.2.0 version labels Jul 18, 2023
@SbloodyS SbloodyS added this to the 3.2.0 milestone Jul 18, 2023
@davidzollo
Copy link
Contributor

davidzollo commented Jul 20, 2023

Please add Unit Test!

@fuchanghai
Copy link
Member Author

fuchanghai commented Jul 25, 2023

Please add Unit Test!

Done

@fuchanghai
Copy link
Member Author

fuchanghai commented Jul 25, 2023

@davidzollo @EricGao888 plz rerun

@fuchanghai
Copy link
Member Author

fuchanghai commented Jul 26, 2023

@caishunfeng PTAL

caishunfeng
caishunfeng reviewed Jul 26, 2023
View reviewed changes
...scheduler-service/src/test/java/org/apache/dolphinscheduler/service/utils/DagHelperTest.java
* -> 2->
* / \
* / \
* 0->1(switch)->5 6
Copy link
Contributor

@caishunfeng caishunfeng Jul 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@fuchanghai fuchanghai requested a review from caishunfeng July 26, 2023 07:18
caishunfeng
caishunfeng previously approved these changes Jul 26, 2023
View reviewed changes
Copy link
Contributor

@caishunfeng caishunfeng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@caishunfeng
Copy link
Contributor

caishunfeng commented Jul 26, 2023

run CI

@fuchanghai
Copy link
Member Author

fuchanghai commented Jul 27, 2023

@davidzollo @caishunfeng @SbloodyS This PR should also be merged to 3.1.x and 3.0.x

@fuchanghai fuchanghai requested a review from caishunfeng July 27, 2023 05:33
@SbloodyS
Copy link
Member

SbloodyS commented Jul 28, 2023

@davidzollo @caishunfeng @SbloodyS This PR should also be merged to 3.1.x and 3.0.x

cc @zhuangchong @zhongjiajie

@sonarqubecloud
Copy link

sonarqubecloud bot commented Jul 28, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 1 Code Smell

63.4% 63.4% Coverage
0.0% 0.0% Duplication

@sonarqubecloud
Copy link

sonarqubecloud bot commented Aug 1, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 1 Code Smell

63.4% 63.4% Coverage
0.0% 0.0% Duplication

@ruanwenjun ruanwenjun merged commit b391b74 into apache:dev Aug 1, 2023
zhuangchong pushed a commit that referenced this pull request Aug 2, 2023
@fuchanghai @zhuangchong
[fix-#14537] the branch that needs to be executed overlaps with anoth…
6453740 
…er branch, it may not be able to complete the normal execution (#14563)
@zhuangchong zhuangchong modified the milestones: 3.2.0, 3.1.8 Aug 2, 2023
zhuangchong pushed a commit to zhuangchong/incubator-dolphinscheduler that referenced this pull request Aug 2, 2023
@fuchanghai @zhuangchong
cherry-pick [fix-apache#14537] the branch that needs to be executed o…
cb26ec4 
…verlaps with another branch, it may not be able to complete the normal execution apache#14563
@zhuangchong zhuangchong mentioned this pull request Aug 2, 2023
Merged
zhuangchong added a commit that referenced this pull request Aug 2, 2023
@zhuangchong @fuchanghai
[3.1.8] [fix-#14537] the branch that needs to be executed overlaps wi…
ef90774 
…th another branch, it may not be able to complete the normal execution #14563 (#14689)

Co-authored-by: fuchanghai <[email protected]>
@fuchanghai fuchanghai mentioned this pull request Oct 11, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ruanwenjun ruanwenjun ruanwenjun approved these changes

@caishunfeng caishunfeng Awaiting requested review from caishunfeng caishunfeng is a code owner

Assignees

@fuchanghai fuchanghai

Labels

3.2.0 for 3.2.0 version backend bug Something isn't working ready-to-merge

Projects

None yet

Milestone

3.1.8

Development

Successfully merging this pull request may close these issues.

[Bug] [SwitchTask] f the branch that needs to be executed overlaps with another branch, it may not be able to complete the normal execution

7 participants

@fuchanghai @codecov-commenter @davidzollo @caishunfeng @SbloodyS @ruanwenjun @zhuangchong