Skip to content

[Fix-17943][dolphinscheduler-task-dinky] When DolphinScheduler calls a Dinky job and passes date parameters, the actual values are not being replaced #17945

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

Open
shaolei7788 wants to merge 12 commits into
base: dev
Choose a base branch
from
+9 −18
Open

[Fix-17943][dolphinscheduler-task-dinky] When DolphinScheduler calls a Dinky job and passes date parameters, the actual values are not being replaced #17945

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0d693a8
优化Dinky任务变量生成逻辑
Feb 4, 2026
7b33200
Merge branch 'dev' into dev
SbloodyS Feb 4, 2026
38bd39c
Apply suggestion from @SbloodyS
zhongjiajie Feb 6, 2026
e9356d6
Apply suggestion from @SbloodyS
zhongjiajie Feb 6, 2026
a36ad81
Apply suggestion from @SbloodyS
zhongjiajie Feb 6, 2026
4838dc1
Apply suggestion from @SbloodyS
zhongjiajie Feb 6, 2026
414ed1b
Apply suggestion from @SbloodyS
zhongjiajie Feb 6, 2026
71103c8
check style
Feb 4, 2026
a910ea9
Optimize this code
Feb 6, 2026
e9c69ea
Optimize this code
Feb 6, 2026
810cfb2
Optimize this code
Feb 6, 2026
dedf9f9
Optimize this code
Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 9 additions & 18 deletions ...ler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext;
import org.apache.dolphinscheduler.plugin.task.api.model.Property;
import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters;
import org.apache.dolphinscheduler.plugin.task.api.parser.PlaceholderUtils;
import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;

import org.apache.commons.lang3.StringUtils;
Expand All @@ -47,7 +46,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

import lombok.extern.slf4j.Slf4j;

Expand Down Expand Up @@ -337,24 +335,17 @@ public void cancelApplication() throws TaskException {
}

private Map<String, String> generateVariables() {
Map<String, String> variables = new ConcurrentHashMap<>();
List<Property> propertyList = JSONUtils.toList(taskExecutionContext.getGlobalParams(), Property.class);
if (propertyList != null && !propertyList.isEmpty()) {
for (Property property : propertyList) {
variables.put(property.getProp(), property.getValue());
}
}
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);
Map<String, String> variables = ParameterUtils.convert(prepareParamsMap);
List<Property> localParams = this.dinkyParameters.getLocalParams();
if (!localParams.isEmpty()) {
// replace localParams value where value is expression
for (Property property : localParams) {
variables.put(property.getProp(),
ParameterUtils.convertParameterPlaceholders(property.getValue(), variables));
}
}
log.info("sending variables to dinky: {}", variables);
return variables;
}

Expand Down