Skip to content
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.

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

Split the upgrade code #13436

Merged
merged 2 commits into from
Jan 20, 2023
Merged

Conversation

ruanwenjun
Copy link
Member

@ruanwenjun ruanwenjun commented Jan 20, 2023

  1. Split the upgrade code into different version
  2. Log the dml/ddl sql in origin friendly format

image

  1. Fix ddl of 3.0.0 and 3.1.0

Purpose of the pull request

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:

(or)

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

@ruanwenjun ruanwenjun added the 3.2.0 for 3.2.0 version label Jan 20, 2023
@ruanwenjun ruanwenjun added this to the 3.2.0 milestone Jan 20, 2023
@ruanwenjun ruanwenjun added bug Something isn't working improvement make more easy to user or prompt friendly and removed backend labels Jan 20, 2023
@codecov-commenter
Copy link

codecov-commenter commented Jan 20, 2023

Codecov Report

Merging #13436 (f9eb693) into dev (3b54de0) will decrease coverage by 0.03%.
The diff coverage is 8.33%.

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

@@             Coverage Diff              @@
##                dev   #13436      +/-   ##
============================================
- Coverage     39.57%   39.55%   -0.03%     
+ Complexity     4335     4331       -4     
============================================
  Files          1086     1086              
  Lines         40965    40928      -37     
  Branches       4700     4681      -19     
============================================
- Hits          16213    16188      -25     
+ Misses        22949    22934      -15     
- Partials       1803     1806       +3     
Impacted Files Coverage Δ
...he/dolphinscheduler/common/utils/ScriptRunner.java 14.08% <0.00%> (+0.38%) ⬆️
...che/dolphinscheduler/dao/upgrade/JsonSplitDao.java 0.00% <ø> (ø)
...hinscheduler/dao/upgrade/ProcessDefinitionDao.java 7.79% <0.00%> (-1.07%) ⬇️
...pache/dolphinscheduler/dao/upgrade/ProjectDao.java 0.00% <0.00%> (ø)
...ache/dolphinscheduler/dao/upgrade/ScheduleDao.java 0.00% <0.00%> (ø)
...e/dolphinscheduler/dao/upgrade/WorkerGroupDao.java 41.17% <25.00%> (-14.38%) ⬇️
...heduler/api/service/impl/ResourcesServiceImpl.java 38.43% <100.00%> (+0.03%) ⬆️
...er/master/dispatch/host/assign/RandomSelector.java 77.77% <0.00%> (-5.56%) ⬇️
...erver/master/processor/queue/TaskEventService.java 75.00% <0.00%> (-5.36%) ⬇️
... and 28 more

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

@ruanwenjun ruanwenjun force-pushed the dev_wenjun_splitUpgrade branch 2 times, most recently from ea93647 to f983eb4 Compare January 20, 2023 06:10
@ruanwenjun
Copy link
Member Author

The Code scanning results seems not correct, all resource leak has been fixed.
image

2. Log the dml/ddl sql in origin friendly format
3. Fix ddl of 3.0.0 and 3.1.0
@kezhenxu94
Copy link
Member

The Code scanning results seems not correct, all resource leak has been fixed.
image

It looks correct to me, because it says these are fixed alerts

image

@kezhenxu94
Copy link
Member

The reason why it fails is that, there is a new detected security issue here

image

@sonarcloud
Copy link

sonarcloud bot commented Jan 20, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 35 Code Smells

0.5% 0.5% Coverage
0.0% 0.0% Duplication

@ruanwenjun
Copy link
Member Author

The reason why it fails is that, there is a new detected security issue here

image

Thanks for your reminder, helps a lot.

@ruanwenjun ruanwenjun merged commit 713fdbc into apache:dev Jan 20, 2023
@ruanwenjun ruanwenjun deleted the dev_wenjun_splitUpgrade branch January 20, 2023 12:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3.2.0 for 3.2.0 version backend bug Something isn't working improvement make more easy to user or prompt friendly
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants