[Fix-17943][dolphinscheduler-task-dinky] When DolphinScheduler calls a Dinky job and passes date parameters, the actual values are not being replaced#17945
Open
shaolei7788 wants to merge 7 commits intoapache:devfrom
Conversation
shaolei7788
requested review from
Gallardot,
SbloodyS and
caishunfeng
as code owners
|
Thanks for opening this pull request! Please check out our contributing guidelines. (https://github.com/apache/dolphinscheduler/blob/dev/docs/docs/en/contribute/join/pull-request.md) |
SbloodyS
changed the title
SbloodyS
added
bug
SbloodyS
requested changes
Feb 4, 2026
Member
SbloodyS
left a comment
SbloodyS
left a comment
There was a problem hiding this comment.
Please don't directly using AI genrerated code.
Author
No,I don't |
SbloodyS
requested changes
Feb 6, 2026
...eduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java
Outdated
Show resolved
Hide resolved
...eduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java
Outdated
Show resolved
Hide resolved
...eduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java
Outdated
Show resolved
Hide resolved
...eduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java
Outdated
Show resolved
Hide resolved
...eduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java
Outdated
Show resolved
Hide resolved
Co-authored-by: xiangzihao <zihaoxiang@apache.org>
Co-authored-by: xiangzihao <zihaoxiang@apache.org>
Co-authored-by: xiangzihao <zihaoxiang@apache.org>
Co-authored-by: xiangzihao <zihaoxiang@apache.org>
Co-authored-by: xiangzihao <zihaoxiang@apache.org>
zhongjiajie
reviewed
Feb 6, 2026
Comment on lines
+355
to
+371
| if (Objects.isNull(variables.get(localParam.getProp())) || variables.get(localParam.getProp()).isEmpty()) { | ||
| if (localParam.getValue() != null && !localParam.getValue().isEmpty()) { | ||
| String value = ParameterUtils.convertParameterPlaceholders(localParam.getValue(), variables); | ||
| if (StringUtils.isNotBlank(value)) { | ||
| variables.put(localParam.getProp(), value); | ||
| } | ||
| } else { | ||
| if (!globalParams.isEmpty()) { | ||
| for (Property globalParam : globalParams) { | ||
| if (globalParam.getProp().equals(localParam.getProp())) { | ||
| if (globalParam.getValue() != null && !globalParam.getValue().isEmpty()) { | ||
| String value = ParameterUtils.convertParameterPlaceholders(globalParam.getValue(), variables); | ||
| if (StringUtils.isNotBlank(value)) { | ||
| variables.put(localParam.getProp(), value); | ||
| } | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
can we find some ways to avoid such many condition here?
Member
|
I remember we have CI check detect whether it have chinese in PR, does it still working? @SbloodyS |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Purpose of the pull request
close #17943
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)
Pull Request Notice
Pull Request Notice
If your pull request contains incompatible change, you should also add it to
docs/docs/en/guide/upgrade/incompatible.md