You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by GitBox <gi...@apache.org> on 2022/09/21 13:23:24 UTC
[GitHub] [dolphinscheduler] caishunfeng opened a new pull request, #12093: [Bug][Timezone][3.0.1] fix timezone when complement data and preview
caishunfeng opened a new pull request, #12093:
URL: https://github.com/apache/dolphinscheduler/pull/12093
## Purpose of the pull request
fix timezone when complement data and preview
## Brief change log
Set complement data list when api execute complement data, and master use it directly but not getSelfFireDateList again.
Fix schedule preview error when change timezone.
## Verify this pull request
- *Manually verified the change by testing locally.*
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@dolphinscheduler.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [dolphinscheduler] caishunfeng merged pull request #12093: [Bug][Timezone][3.0.1] fix timezone when complement data and preview
Posted by GitBox <gi...@apache.org>.
caishunfeng merged PR #12093:
URL: https://github.com/apache/dolphinscheduler/pull/12093
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@dolphinscheduler.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [dolphinscheduler] sonarcloud[bot] commented on pull request #12093: [Bug][Timezone][3.0.1] fix timezone when complement data and preview
Posted by GitBox <gi...@apache.org>.
sonarcloud[bot] commented on PR #12093:
URL: https://github.com/apache/dolphinscheduler/pull/12093#issuecomment-1253988503
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache-dolphinscheduler&pullRequest=12093)
[](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=BUG) [6 Bugs](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=VULNERABILITY) [6 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=SECURITY_HOTSPOT) [3 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=CODE_SMELL) [240 Code Smells](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=12093&metric=new_coverage&view=list) [39.6% Coverage](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=12093&metric=new_coverage&view=list)
[](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=12093&metric=new_duplicated_lines_density&view=list) [9.4% Duplication](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=12093&metric=new_duplicated_lines_density&view=list)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@dolphinscheduler.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [dolphinscheduler] sonarcloud[bot] commented on pull request #12093: [Bug][Timezone][3.0.1] fix timezone when complement data and preview
Posted by GitBox <gi...@apache.org>.
sonarcloud[bot] commented on PR #12093:
URL: https://github.com/apache/dolphinscheduler/pull/12093#issuecomment-1254466818
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache-dolphinscheduler&pullRequest=12093)
[](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=BUG) [6 Bugs](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=VULNERABILITY) [6 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=SECURITY_HOTSPOT) [3 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=CODE_SMELL) [239 Code Smells](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=12093&metric=new_coverage&view=list) [39.6% Coverage](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=12093&metric=new_coverage&view=list)
[](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=12093&metric=new_duplicated_lines_density&view=list) [9.4% Duplication](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=12093&metric=new_duplicated_lines_density&view=list)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@dolphinscheduler.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [dolphinscheduler] sonarcloud[bot] commented on pull request #12093: [Bug][Timezone][3.0.1] fix timezone when complement data and preview
Posted by GitBox <gi...@apache.org>.
sonarcloud[bot] commented on PR #12093:
URL: https://github.com/apache/dolphinscheduler/pull/12093#issuecomment-1254466214
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache-dolphinscheduler&pullRequest=12093)
[](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=BUG) [6 Bugs](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=VULNERABILITY) [6 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=SECURITY_HOTSPOT) [3 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=CODE_SMELL) [239 Code Smells](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=12093&metric=new_coverage&view=list) [39.6% Coverage](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=12093&metric=new_coverage&view=list)
[](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=12093&metric=new_duplicated_lines_density&view=list) [9.4% Duplication](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=12093&metric=new_duplicated_lines_density&view=list)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@dolphinscheduler.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [dolphinscheduler] sonarcloud[bot] commented on pull request #12093: [Bug][Timezone][3.0.1] fix timezone when complement data and preview
Posted by GitBox <gi...@apache.org>.
sonarcloud[bot] commented on PR #12093:
URL: https://github.com/apache/dolphinscheduler/pull/12093#issuecomment-1253988086
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache-dolphinscheduler&pullRequest=12093)
[](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=BUG) [6 Bugs](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=VULNERABILITY) [6 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=SECURITY_HOTSPOT) [3 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=CODE_SMELL) [240 Code Smells](https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&pullRequest=12093&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=12093&metric=new_coverage&view=list) [39.6% Coverage](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=12093&metric=new_coverage&view=list)
[](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=12093&metric=new_duplicated_lines_density&view=list) [9.4% Duplication](https://sonarcloud.io/component_measures?id=apache-dolphinscheduler&pullRequest=12093&metric=new_duplicated_lines_density&view=list)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@dolphinscheduler.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [dolphinscheduler] codecov-commenter commented on pull request #12093: [Bug][Timezone][3.0.1] fix timezone when complement data and preview
Posted by GitBox <gi...@apache.org>.
codecov-commenter commented on PR #12093:
URL: https://github.com/apache/dolphinscheduler/pull/12093#issuecomment-1253980717
# [Codecov](https://codecov.io/gh/apache/dolphinscheduler/pull/12093?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
> :exclamation: No coverage uploaded for pull request base (`3.0.1-release@b3c27ef`). [Click here to learn what that means](https://docs.codecov.io/docs/error-reference?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#section-missing-base-commit).
> The diff coverage is `n/a`.
```diff
@@ Coverage Diff @@
## 3.0.1-release #12093 +/- ##
================================================
Coverage ? 39.87%
Complexity ? 4581
================================================
Files ? 888
Lines ? 35136
Branches ? 3862
================================================
Hits ? 14010
Misses ? 19763
Partials ? 1363
```
:mega: We’re building smart automated test selection to slash your CI/CD build times. [Learn more](https://about.codecov.io/iterative-testing/?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@dolphinscheduler.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [dolphinscheduler] ruanwenjun commented on a diff in pull request #12093: [Bug][Timezone][3.0.1] fix timezone when complement data and preview
Posted by GitBox <gi...@apache.org>.
ruanwenjun commented on code in PR #12093:
URL: https://github.com/apache/dolphinscheduler/pull/12093#discussion_r977116917
##########
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java:
##########
@@ -759,9 +766,18 @@ protected int createComplementCommandList(Date start, Date end, RunMode runMode,
endDateIndex += singleCommandItems;
}
- cmdParam.put(CMDPARAM_COMPLEMENT_DATA_START_DATE, DateUtils.dateToString(listDate.get(startDateIndex)));
- cmdParam.put(CMDPARAM_COMPLEMENT_DATA_END_DATE, DateUtils.dateToString(listDate.get(endDateIndex)));
+ Date startDate = listDate.get(startDateIndex);
+ Date endDate = listDate.get(endDateIndex);
+
+ cmdParam.put(CMDPARAM_COMPLEMENT_DATA_START_DATE, DateUtils.dateToString(startDate, ZoneId.systemDefault().getId()));
+ cmdParam.put(CMDPARAM_COMPLEMENT_DATA_END_DATE, DateUtils.dateToString(endDate, ZoneId.systemDefault().getId()));
+ cmdParam.put(CMDPARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST, JSONUtils.toJsonString(CronUtils.getSelfFireDateList(startDate, endDate, schedules)));
command.setCommandParam(JSONUtils.toJsonString(cmdParam));
+
+ logger.info("before create complement command: startDate:{}, startStr:{}, endDate:{}, endStr:{}, complement date list: {}",
+ listDate.get(startDateIndex), DateUtils.dateToString(listDate.get(startDateIndex), ZoneId.systemDefault().getId()),
+ listDate.get(endDateIndex), DateUtils.dateToString(listDate.get(endDateIndex), ZoneId.systemDefault().getId()), JSONUtils.toJsonString(CronUtils.getSelfFireDateList(startDate, endDate, schedules)));
+
Review Comment:
```suggestion
String startDateStr = DateUtils.dateToString(startDate, ZoneId.systemDefault().getId());
String endDateStr = DateUtils.dateToString(endDate, ZoneId.systemDefault().getId())
String dateListStr = JSONUtils.toJsonString(CronUtils.getSelfFireDateList(startDate, endDate, schedules));
cmdParam.put(CMDPARAM_COMPLEMENT_DATA_START_DATE, startDateStr);
cmdParam.put(CMDPARAM_COMPLEMENT_DATA_END_DATE, endDateStr);
cmdParam.put(CMDPARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST, dateListStr);
command.setCommandParam(JSONUtils.toJsonString(cmdParam));
logger.info("before create complement command: startDate:{}, startStr:{}, endDate:{}, endStr:{}, complement date list: {}",
startDateStr,
endDateStr, dateListStr);
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@dolphinscheduler.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [dolphinscheduler] caishunfeng commented on a diff in pull request #12093: [Bug][Timezone][3.0.1] fix timezone when complement data and preview
Posted by GitBox <gi...@apache.org>.
caishunfeng commented on code in PR #12093:
URL: https://github.com/apache/dolphinscheduler/pull/12093#discussion_r977134160
##########
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java:
##########
@@ -759,9 +766,18 @@ protected int createComplementCommandList(Date start, Date end, RunMode runMode,
endDateIndex += singleCommandItems;
}
- cmdParam.put(CMDPARAM_COMPLEMENT_DATA_START_DATE, DateUtils.dateToString(listDate.get(startDateIndex)));
- cmdParam.put(CMDPARAM_COMPLEMENT_DATA_END_DATE, DateUtils.dateToString(listDate.get(endDateIndex)));
+ Date startDate = listDate.get(startDateIndex);
+ Date endDate = listDate.get(endDateIndex);
+
+ cmdParam.put(CMDPARAM_COMPLEMENT_DATA_START_DATE, DateUtils.dateToString(startDate, ZoneId.systemDefault().getId()));
+ cmdParam.put(CMDPARAM_COMPLEMENT_DATA_END_DATE, DateUtils.dateToString(endDate, ZoneId.systemDefault().getId()));
+ cmdParam.put(CMDPARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST, JSONUtils.toJsonString(CronUtils.getSelfFireDateList(startDate, endDate, schedules)));
command.setCommandParam(JSONUtils.toJsonString(cmdParam));
+
+ logger.info("before create complement command: startDate:{}, startStr:{}, endDate:{}, endStr:{}, complement date list: {}",
+ listDate.get(startDateIndex), DateUtils.dateToString(listDate.get(startDateIndex), ZoneId.systemDefault().getId()),
+ listDate.get(endDateIndex), DateUtils.dateToString(listDate.get(endDateIndex), ZoneId.systemDefault().getId()), JSONUtils.toJsonString(CronUtils.getSelfFireDateList(startDate, endDate, schedules)));
+
Review Comment:
done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@dolphinscheduler.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org