ruanwenjun commented on code in PR #10704: URL: https://github.com/apache/dolphinscheduler/pull/10704#discussion_r910979371
########## dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/expand/DolphinSchedulerCuringGlobalParams.java: ########## @@ -0,0 +1,199 @@ +/* + * 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.service.expand; + +import com.google.common.base.Preconditions; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.CommandType; +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.common.utils.placeholder.BusinessTimeUtils; +import org.apache.dolphinscheduler.dao.entity.ProcessInstance; +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.ParamUtils; +import org.apache.dolphinscheduler.plugin.task.api.utils.MapUtils; +import org.apache.dolphinscheduler.spi.utils.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.PARAMETER_TASK_EXECUTE_PATH; +import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.PARAMETER_TASK_INSTANCE_ID; + +@Component +public class DolphinSchedulerCuringGlobalParams implements CuringParamsService { + + private static final Logger logger = LoggerFactory.getLogger(DolphinSchedulerCuringGlobalParams.class); + + @Autowired + private TimePlaceholderResolverExpandService timePlaceholderResolverExpandService; + + @Override + public String convertParameterPlaceholders(String val, Map<String, String> allParamMap) { + return ParameterUtils.convertParameterPlaceholders(val, allParamMap); + } + + @Override + public boolean timeFunctionNeedExpand(String placeholderName) { + return timePlaceholderResolverExpandService.timeFunctionNeedExpand(placeholderName); + } + + @Override + public String timeFunctionExtension(Integer processInstanceId, String timezone, String placeholderName) { + return timePlaceholderResolverExpandService.timeFunctionExtension(processInstanceId, timezone, placeholderName); + } + + @Override + public String curingGlobalParams(Integer processInstanceId, Map<String, String> globalParamMap, List<Property> globalParamList, CommandType commandType, Date scheduleTime, String timezone) { + if (globalParamList == null || globalParamList.isEmpty()) { + return null; + } + Map<String, String> globalMap = new HashMap<>(); + if (globalParamMap != null) { + globalMap.putAll(globalParamMap); + } + Map<String, String> allParamMap = new HashMap<>(); + //If it is a complement, a complement time needs to be passed in, according to the task type + Map<String, String> timeParams = BusinessTimeUtils. + getBusinessTime(commandType, scheduleTime, timezone); + + if (timeParams != null) { + allParamMap.putAll(timeParams); + } + allParamMap.putAll(globalMap); + Set<Map.Entry<String, String>> entries = allParamMap.entrySet(); + Map<String, String> resolveMap = new HashMap<>(); + for (Map.Entry<String, String> entry : entries) { + String val = entry.getValue(); + if (val.startsWith("$")) { + String str = ""; + // whether external scaling calculation is required + if (timeFunctionNeedExpand(val)) { + str = timeFunctionExtension(processInstanceId, timezone, val); + } else { + str = convertParameterPlaceholders(val, allParamMap); + } + resolveMap.put(entry.getKey(), str); + } + } + globalMap.putAll(resolveMap); + for (Property property : globalParamList) { + String val = globalMap.get(property.getProp()); + if (val != null) { + property.setValue(val); + } + } + return JSONUtils.toJsonString(globalParamList); + } + + @Override + public Map<String, Property> paramParsingPreparation(TaskExecutionContext taskExecutionContext, AbstractParameters parameters, ProcessInstance processInstance) { + Preconditions.checkNotNull(taskExecutionContext); + Preconditions.checkNotNull(parameters); + setGlobalParamsMap(taskExecutionContext); Review Comment: So this method will affect `taskExecutionContext`, I think this should be note in the comment. ########## dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java: ########## @@ -255,7 +254,7 @@ public WorkflowExecuteRunnable(ProcessInstance processInstance , ProcessAlertManager processAlertManager , MasterConfig masterConfig , StateWheelExecuteThread stateWheelExecuteThread - , CuringGlobalParamsService curingGlobalParamsService) { + , CuringParamsService curingGlobalParamsService) { Review Comment: ```suggestion , CuringParamsService curingParamsService) { ``` ########## dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/builder/TaskExecutionContextBuilder.java: ########## @@ -131,6 +136,13 @@ public TaskExecutionContextBuilder buildK8sTaskRelatedInfo(K8sTaskExecutionConte taskExecutionContext.setK8sTaskExecutionContext(k8sTaskExecutionContext); return this; } + + public TaskExecutionContextBuilder buildParamInfo(CuringParamsService curingParamsService, AbstractParameters baseParam, ProcessInstance processInstance) { + Map<String, Property> propertyMap = curingParamsService.paramParsingPreparation(taskExecutionContext, baseParam, processInstance); + taskExecutionContext.setPrepareParamsMap(propertyMap); + return this; + } Review Comment: It's better to calculate the param in the upper layer. ```suggestion public TaskExecutionContextBuilder buildParamInfo(Map<String, Property> propertyMap) { taskExecutionContext.setPrepareParamsMap(propertyMap); return this; } ``` ########## dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/expand/DolphinSchedulerCuringGlobalParams.java: ########## @@ -0,0 +1,199 @@ +/* + * 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.service.expand; + +import com.google.common.base.Preconditions; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.CommandType; +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.common.utils.placeholder.BusinessTimeUtils; +import org.apache.dolphinscheduler.dao.entity.ProcessInstance; +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.ParamUtils; +import org.apache.dolphinscheduler.plugin.task.api.utils.MapUtils; +import org.apache.dolphinscheduler.spi.utils.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.PARAMETER_TASK_EXECUTE_PATH; +import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.PARAMETER_TASK_INSTANCE_ID; + +@Component +public class DolphinSchedulerCuringGlobalParams implements CuringParamsService { + + private static final Logger logger = LoggerFactory.getLogger(DolphinSchedulerCuringGlobalParams.class); + + @Autowired + private TimePlaceholderResolverExpandService timePlaceholderResolverExpandService; + + @Override + public String convertParameterPlaceholders(String val, Map<String, String> allParamMap) { + return ParameterUtils.convertParameterPlaceholders(val, allParamMap); + } + + @Override + public boolean timeFunctionNeedExpand(String placeholderName) { + return timePlaceholderResolverExpandService.timeFunctionNeedExpand(placeholderName); + } + + @Override + public String timeFunctionExtension(Integer processInstanceId, String timezone, String placeholderName) { + return timePlaceholderResolverExpandService.timeFunctionExtension(processInstanceId, timezone, placeholderName); + } + + @Override + public String curingGlobalParams(Integer processInstanceId, Map<String, String> globalParamMap, List<Property> globalParamList, CommandType commandType, Date scheduleTime, String timezone) { + if (globalParamList == null || globalParamList.isEmpty()) { + return null; + } + Map<String, String> globalMap = new HashMap<>(); + if (globalParamMap != null) { + globalMap.putAll(globalParamMap); + } + Map<String, String> allParamMap = new HashMap<>(); + //If it is a complement, a complement time needs to be passed in, according to the task type + Map<String, String> timeParams = BusinessTimeUtils. + getBusinessTime(commandType, scheduleTime, timezone); + + if (timeParams != null) { + allParamMap.putAll(timeParams); + } + allParamMap.putAll(globalMap); + Set<Map.Entry<String, String>> entries = allParamMap.entrySet(); + Map<String, String> resolveMap = new HashMap<>(); + for (Map.Entry<String, String> entry : entries) { + String val = entry.getValue(); + if (val.startsWith("$")) { + String str = ""; + // whether external scaling calculation is required + if (timeFunctionNeedExpand(val)) { + str = timeFunctionExtension(processInstanceId, timezone, val); + } else { + str = convertParameterPlaceholders(val, allParamMap); + } + resolveMap.put(entry.getKey(), str); + } + } + globalMap.putAll(resolveMap); + for (Property property : globalParamList) { + String val = globalMap.get(property.getProp()); + if (val != null) { + property.setValue(val); + } + } + return JSONUtils.toJsonString(globalParamList); + } + + @Override + public Map<String, Property> paramParsingPreparation(TaskExecutionContext taskExecutionContext, AbstractParameters parameters, ProcessInstance processInstance) { + Preconditions.checkNotNull(taskExecutionContext); + Preconditions.checkNotNull(parameters); + setGlobalParamsMap(taskExecutionContext); + Map<String, Property> globalParams = ParamUtils.getUserDefParamsMap(taskExecutionContext.getDefinedParams()); + Map<String,String> globalParamsMap = taskExecutionContext.getDefinedParams(); + org.apache.dolphinscheduler.spi.enums.CommandType commandType = org.apache.dolphinscheduler.spi.enums.CommandType.of(taskExecutionContext.getCmdTypeIfComplement()); + Date scheduleTime = taskExecutionContext.getScheduleTime(); + + // combining local and global parameters + Map<String, Property> localParams = parameters.getInputLocalParametersMap(); + + //stream pass params + Map<String, Property> varParams = parameters.getVarPoolMap(); + + if (globalParams.size() == 0 && localParams.size() == 0 && varParams.size() == 0) { Review Comment: Use `isEmpty()` is better than `.size() == 0` ########## dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/expand/DolphinSchedulerCuringGlobalParams.java: ########## @@ -0,0 +1,199 @@ +/* + * 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.service.expand; + +import com.google.common.base.Preconditions; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.CommandType; +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.common.utils.placeholder.BusinessTimeUtils; +import org.apache.dolphinscheduler.dao.entity.ProcessInstance; +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.ParamUtils; +import org.apache.dolphinscheduler.plugin.task.api.utils.MapUtils; +import org.apache.dolphinscheduler.spi.utils.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.PARAMETER_TASK_EXECUTE_PATH; +import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.PARAMETER_TASK_INSTANCE_ID; + +@Component +public class DolphinSchedulerCuringGlobalParams implements CuringParamsService { + + private static final Logger logger = LoggerFactory.getLogger(DolphinSchedulerCuringGlobalParams.class); + + @Autowired + private TimePlaceholderResolverExpandService timePlaceholderResolverExpandService; + + @Override + public String convertParameterPlaceholders(String val, Map<String, String> allParamMap) { + return ParameterUtils.convertParameterPlaceholders(val, allParamMap); + } + + @Override + public boolean timeFunctionNeedExpand(String placeholderName) { + return timePlaceholderResolverExpandService.timeFunctionNeedExpand(placeholderName); + } + + @Override + public String timeFunctionExtension(Integer processInstanceId, String timezone, String placeholderName) { + return timePlaceholderResolverExpandService.timeFunctionExtension(processInstanceId, timezone, placeholderName); + } + + @Override + public String curingGlobalParams(Integer processInstanceId, Map<String, String> globalParamMap, List<Property> globalParamList, CommandType commandType, Date scheduleTime, String timezone) { + if (globalParamList == null || globalParamList.isEmpty()) { + return null; + } + Map<String, String> globalMap = new HashMap<>(); + if (globalParamMap != null) { + globalMap.putAll(globalParamMap); + } + Map<String, String> allParamMap = new HashMap<>(); + //If it is a complement, a complement time needs to be passed in, according to the task type + Map<String, String> timeParams = BusinessTimeUtils. + getBusinessTime(commandType, scheduleTime, timezone); + + if (timeParams != null) { + allParamMap.putAll(timeParams); + } + allParamMap.putAll(globalMap); + Set<Map.Entry<String, String>> entries = allParamMap.entrySet(); + Map<String, String> resolveMap = new HashMap<>(); + for (Map.Entry<String, String> entry : entries) { + String val = entry.getValue(); + if (val.startsWith("$")) { + String str = ""; + // whether external scaling calculation is required + if (timeFunctionNeedExpand(val)) { + str = timeFunctionExtension(processInstanceId, timezone, val); + } else { + str = convertParameterPlaceholders(val, allParamMap); + } + resolveMap.put(entry.getKey(), str); + } + } + globalMap.putAll(resolveMap); + for (Property property : globalParamList) { + String val = globalMap.get(property.getProp()); + if (val != null) { + property.setValue(val); + } + } + return JSONUtils.toJsonString(globalParamList); + } + + @Override + public Map<String, Property> paramParsingPreparation(TaskExecutionContext taskExecutionContext, AbstractParameters parameters, ProcessInstance processInstance) { + Preconditions.checkNotNull(taskExecutionContext); + Preconditions.checkNotNull(parameters); Review Comment: It's better to use `@NonNull` in the method to replace Preconditions.checkNotNull. -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
