guyinyou commented on a change in pull request #3659: URL: https://github.com/apache/incubator-dolphinscheduler/pull/3659#discussion_r494363690
########## File path: dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/TaskParams.java ########## @@ -0,0 +1,78 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.dolphinscheduler.common.task; + +import java.util.Map; + +public class TaskParams { + + private String rawScript; + private Map<String, String>[] localParams; + + public void setRawScript(String rawScript) { + this.rawScript = rawScript; + } + + public void setLocalParams(Map<String, String>[] localParams) { + this.localParams = localParams; + } + + public String getRawScript() { + return rawScript; + } + + public void setLocalParamValue(String prop, Object value) { + if (localParams == null) { + return; + } + for (int i = 0; i < localParams.length; i++) { + if (localParams[i].get("prop").equals(prop)) { + localParams[i].put("value", (String)value); + } + } + } + + public void setLocalParamValue(Map<String, Object> propToValue) { + if (localParams == null) { + return; + } + for (int i = 0; i < localParams.length; i++) { + String prop = localParams[i].get("prop"); + if (propToValue.containsKey(prop)) { Review comment: I have fixed that on commits "7ca9de4" ########## File path: dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java ########## @@ -651,14 +653,22 @@ private void setTaskNodeSkip(List<String> taskNodesSkipList){ * submit post node * @param parentNodeName parent node name */ + private Map<String,Object> propToValue = new ConcurrentHashMap<String, Object>(); private void submitPostNode(String parentNodeName){ List<String> submitTaskNodeList = parsePostNodeList(parentNodeName); List<TaskInstance> taskInstances = new ArrayList<>(); for(String taskNode : submitTaskNodeList){ + try { + VarPoolUtils.convertVarPoolToMap(propToValue, processInstance.getVarPool()); + } catch (ParseException e) { + logger.error("parse {} exception", processInstance.getVarPool(), e); Review comment: Thank you for your proposal. I think about it carefully, but I still can't think of how to deal with the wrong situation. Moreover, under normal circumstances, varpool will only be empty or generated according to the normal format. Generally, there will be no error. ########## File path: dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java ########## @@ -651,14 +653,22 @@ private void setTaskNodeSkip(List<String> taskNodesSkipList){ * submit post node * @param parentNodeName parent node name */ + private Map<String,Object> propToValue = new ConcurrentHashMap<String, Object>(); private void submitPostNode(String parentNodeName){ List<String> submitTaskNodeList = parsePostNodeList(parentNodeName); List<TaskInstance> taskInstances = new ArrayList<>(); for(String taskNode : submitTaskNodeList){ + try { + VarPoolUtils.convertVarPoolToMap(propToValue, processInstance.getVarPool()); + } catch (ParseException e) { + logger.error("parse {} exception", processInstance.getVarPool(), e); Review comment: You're right. I'll take it ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
