[Fix-17943][dolphinscheduler-task-dinky] When DolphinScheduler calls a Dinky job and passes date parameters, the actual values are not being replaced#18080
Open
shaolei7788 wants to merge 4 commits intoapache:devfrom
Conversation
added 2 commits
March 18, 2026 15:24
shaolei7788
requested review from
Gallardot,
SbloodyS and
caishunfeng
as code owners
SbloodyS
reviewed
Mar 18, 2026
Member
SbloodyS
left a comment
SbloodyS
left a comment
There was a problem hiding this comment.
Please do not create multiple PRs repeatedly next time. This will lead to an increase in reviewer's work.
| } | ||
|
|
||
| } | ||
| } No newline at end of file |
SbloodyS
added
bug
ruanwenjun
reviewed
Mar 18, 2026
Comment on lines
+340
to
+355
| Map<String, Property> prepareParamsMap = taskExecutionContext.getPrepareParamsMap(); | ||
| prepareParamsMap.forEach((key, property) -> { | ||
| if (property != null && property.getValue() != null) { | ||
| variables.put(key, property.getValue().trim()); | ||
| } | ||
| } | ||
| }); | ||
| List<Property> localParams = this.dinkyParameters.getLocalParams(); | ||
| Map<String, Property> prepareParamsMap = taskExecutionContext.getPrepareParamsMap(); | ||
| if (localParams == null || localParams.isEmpty()) { | ||
| return variables; | ||
| } | ||
| Map<String, String> convertMap = ParameterUtils.convert(prepareParamsMap); | ||
| for (Property property : localParams) { | ||
| String propertyValue = property.getValue(); | ||
| String value = PlaceholderUtils.replacePlaceholders(propertyValue, convertMap, true); | ||
| variables.put(property.getProp(), value); | ||
| if (localParams != null) { | ||
| for (Property property : localParams) { | ||
| String value = ParameterUtils.convertParameterPlaceholders(property.getValue(), variables); | ||
| if (value != null && !value.isEmpty()) { | ||
| variables.put(property.getProp(), value.trim()); | ||
| } | ||
| } | ||
| } | ||
| log.info("sending variables to dinky: {}", variables); |
Member
There was a problem hiding this comment.
Maybe directly use taskExecutionContext.getPrepareParamsMap() is enough?
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.
Was this PR generated or assisted by AI?
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)
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