natas_hw
/
dolphinscheduler0701
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[BUG][WORKER-9349]fix param priority (#9379) 

* fix param priority

* fix params priority code logic
This commit is contained in:
Tq 2022-04-07 20:09:53 +08:00 committed by GitHub
parent f186b0d391
commit 2a4fa9cdb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/AbstractParameters.java
View File

@ -75,15 +75,14 @@ public abstract class AbstractParameters implements IParameters {
* @return parameters map * @return parameters map
*/ */
public Map<String, Property> getLocalParametersMap() { public Map<String, Property> getLocalParametersMap() {
Map<String, Property> localParametersMaps = new LinkedHashMap<>();
if (localParams != null) { if (localParams != null) {
Map<String, Property> localParametersMaps = new LinkedHashMap<>();
for (Property property : localParams) { for (Property property : localParams) {
localParametersMaps.put(property.getProp(),property); localParametersMaps.put(property.getProp(),property);
} }
return localParametersMaps;
} }
return null; return localParametersMaps;
} }
/** /**
@ -92,14 +91,13 @@ public abstract class AbstractParameters implements IParameters {
* @return parameters map * @return parameters map
*/ */
public Map<String, Property> getVarPoolMap() { public Map<String, Property> getVarPoolMap() {
Map<String, Property> varPoolMap = new LinkedHashMap<>();
if (varPool != null) { if (varPool != null) {
Map<String, Property> varPoolMap = new LinkedHashMap<>();
for (Property property : varPool) { for (Property property : varPool) {
varPoolMap.put(property.getProp(), property); varPoolMap.put(property.getProp(), property);
} }
return varPoolMap;
} }
return null; return varPoolMap;
} }
public List<Property> getVarPool() { public List<Property> getVarPool() {

20
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parser/ParamUtils.java
View File

@ -63,9 +63,10 @@ public class ParamUtils {
// combining local and global parameters // combining local and global parameters
Map<String, Property> localParams = parameters.getLocalParametersMap(); Map<String, Property> localParams = parameters.getLocalParametersMap();
//stream pass params
Map<String, Property> varParams = parameters.getVarPoolMap(); Map<String, Property> varParams = parameters.getVarPoolMap();
if (globalParams == null && localParams == null) { if (globalParams.size() == 0 && localParams.size() == 0 && varParams.size() == 0) {
return null; return null;
} }
// if it is a complement, // if it is a complement,
@ -85,15 +86,13 @@ public class ParamUtils {
} }
params.put(PARAMETER_TASK_INSTANCE_ID, Integer.toString(taskExecutionContext.getTaskInstanceId())); params.put(PARAMETER_TASK_INSTANCE_ID, Integer.toString(taskExecutionContext.getTaskInstanceId()));
if (globalParams != null && localParams != null) { if (varParams.size() != 0) {
globalParams.putAll(varParams);
}
if (localParams.size() != 0) {
globalParams.putAll(localParams); globalParams.putAll(localParams);
} else if (globalParams == null && localParams != null) {
globalParams = localParams;
}
if (varParams != null) {
varParams.putAll(globalParams);
globalParams = varParams;
} }
Iterator<Map.Entry<String, Property>> iter = globalParams.entrySet().iterator(); Iterator<Map.Entry<String, Property>> iter = globalParams.entrySet().iterator();
while (iter.hasNext()) { while (iter.hasNext()) {
Map.Entry<String, Property> en = iter.next(); Map.Entry<String, Property> en = iter.next();
@ -143,16 +142,15 @@ public class ParamUtils {
* @return parameters map * @return parameters map
*/ */
public static Map<String, Property> getUserDefParamsMap(Map<String, String> definedParams) { public static Map<String, Property> getUserDefParamsMap(Map<String, String> definedParams) {
Map<String, Property> userDefParamsMaps = new HashMap<>();
if (definedParams != null) { if (definedParams != null) {
Map<String, Property> userDefParamsMaps = new HashMap<>();
Iterator<Map.Entry<String, String>> iter = definedParams.entrySet().iterator(); Iterator<Map.Entry<String, String>> iter = definedParams.entrySet().iterator();
while (iter.hasNext()) { while (iter.hasNext()) {
Map.Entry<String, String> en = iter.next(); Map.Entry<String, String> en = iter.next();
Property property = new Property(en.getKey(), Direct.IN, DataType.VARCHAR, en.getValue()); Property property = new Property(en.getKey(), Direct.IN, DataType.VARCHAR, en.getValue());
userDefParamsMaps.put(property.getProp(),property); userDefParamsMaps.put(property.getProp(),property);
} }
return userDefParamsMaps;
} }
return null; return userDefParamsMaps;
} }
} }