test/DolphinScheduler
1
0
Fork 0
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git synced 2024-11-29 18:58:05 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix switch task use boolean type error (#14326)

Browse Source
This commit is contained in:
Wenjun Ruan 2023-06-13 13:26:05 +08:00 committed by GitHub
parent 61118d4467
commit a55612e4f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/switchtask/SwitchLogicTask.java
View File

@ -26,6 +26,7 @@ import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus;
import org.apache.dolphinscheduler.plugin.task.api.model.Property;
import org.apache.dolphinscheduler.plugin.task.api.model.SwitchResultVo;
import org.apache.dolphinscheduler.plugin.task.api.parameters.SwitchParameters;
import org.apache.dolphinscheduler.plugin.task.api.parser.ParameterUtils;
import org.apache.dolphinscheduler.server.master.cache.ProcessInstanceExecCacheManager;
import org.apache.dolphinscheduler.server.master.exception.LogicTaskInitializeException;
import org.apache.dolphinscheduler.server.master.exception.MasterTaskExecuteException;
@ -151,9 +152,11 @@ public class SwitchLogicTask extends BaseSyncLogicTask<SwitchParameters> {
if (property == null) {
return "";
}
String value = property.getValue();
if (!org.apache.commons.lang3.math.NumberUtils.isCreatable(value)) {
value = "\"" + value + "\"";
String value;
if (ParameterUtils.isNumber(property) || ParameterUtils.isBoolean(property)) {
value = "" + ParameterUtils.getParameterValue(property);
} else {
value = "\"" + ParameterUtils.getParameterValue(property) + "\"";
}
log.info("paramName:{}，paramValue:{}", paramName, value);
content = content.replace("${" + paramName + "}", value);

35
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parser/ParameterUtils.java
View File

@ -28,6 +28,7 @@ import org.apache.dolphinscheduler.plugin.task.api.model.Property;
import org.apache.commons.lang3.StringUtils;
import java.io.Serializable;
import java.sql.PreparedStatement;
import java.util.Date;
import java.util.HashMap;
@ -149,6 +150,40 @@ public class ParameterUtils {
}
}
public static Serializable getParameterValue(Property property) {
if (property == null) {
return null;
}
String value = property.getValue();
switch (property.getType()) {
case LONG:
return Long.valueOf(value);
case FLOAT:
return Float.valueOf(value);
case INTEGER:
return Integer.valueOf(value);
case DOUBLE:
return Double.valueOf(value);
case BOOLEAN:
return Boolean.valueOf(value);
// todo: add date type, list type....
default:
return value;
}
}
public static boolean isNumber(Property property) {
return property != null &&
(DataType.INTEGER.equals(property.getType())
|| DataType.LONG.equals(property.getType())
|| DataType.FLOAT.equals(property.getType())
|| DataType.DOUBLE.equals(property.getType()));
}
public static boolean isBoolean(Property property) {
return property != null && DataType.BOOLEAN.equals(property.getType());
}
public static String expandListParameter(Map<Integer, Property> params, String sql) {
Map<Integer, Property> expandMap = new HashMap<>();
if (params == null || params.isEmpty()) {