diff --git a/dolphinscheduler-task-executor/src/main/java/org/apache/dolphinscheduler/task/executor/exceptions/TaskExecutorRuntimeException.java b/dolphinscheduler-task-executor/src/main/java/org/apache/dolphinscheduler/task/executor/exceptions/TaskExecutorRuntimeException.java index 74e4e794dc5d..346db0ae5583 100644 --- a/dolphinscheduler-task-executor/src/main/java/org/apache/dolphinscheduler/task/executor/exceptions/TaskExecutorRuntimeException.java +++ b/dolphinscheduler-task-executor/src/main/java/org/apache/dolphinscheduler/task/executor/exceptions/TaskExecutorRuntimeException.java @@ -23,8 +23,4 @@ public TaskExecutorRuntimeException(String message) { super(message); } - public TaskExecutorRuntimeException(String message, Throwable cause) { - super(message, cause); - } - } diff --git a/dolphinscheduler-task-executor/src/main/java/org/apache/dolphinscheduler/task/executor/exceptions/TaskExecutorRuntimeExceptionEnum.java b/dolphinscheduler-task-executor/src/main/java/org/apache/dolphinscheduler/task/executor/exceptions/TaskExecutorRuntimeExceptionEnum.java deleted file mode 100644 index 3618ca868d42..000000000000 --- a/dolphinscheduler-task-executor/src/main/java/org/apache/dolphinscheduler/task/executor/exceptions/TaskExecutorRuntimeExceptionEnum.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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.task.executor.exceptions; - -public enum TaskExecutorRuntimeExceptionEnum { - - TASK_EXECUTOR_SUBMIT_ERROR(), - - ; - - private int taskId; - - private String message; - -} diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTaskException.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTaskException.java index 5b54bd4d045d..109fb26a8929 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTaskException.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTaskException.java @@ -19,10 +19,6 @@ public class AliyunServerlessSparkTaskException extends RuntimeException { - public AliyunServerlessSparkTaskException() { - super(); - } - public AliyunServerlessSparkTaskException(String message) { super(message); } diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskConstants.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskConstants.java index ee917d24ac7a..b879c89c4f70 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskConstants.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskConstants.java @@ -19,7 +19,6 @@ import org.apache.dolphinscheduler.common.constants.DateConstants; -import java.time.Duration; import java.util.Set; import java.util.regex.Pattern; @@ -42,31 +41,17 @@ private TaskConstants() { public static final int EXIT_CODE_HARD_KILL = 143; public static final String PID = "pid"; - public static final String QUESTION = "?"; - public static final String COMMA = ","; public static final String HYPHEN = "-"; - public static final String SLASH = "/"; - - public static final String COLON = ":"; - public static final String SPACE = " "; - public static final String SINGLE_SLASH = "/"; - - public static final String DOUBLE_SLASH = "//"; - public static final String SINGLE_QUOTES = "'"; public static final String DOUBLE_QUOTES = "\""; - public static final String SEMICOLON = ";"; - public static final String EQUAL_SIGN = "="; - public static final String UNDERLINE = "_"; - /** * sleep time */ @@ -77,13 +62,6 @@ private TaskConstants() { public static final int EXIT_CODE_SUCCESS = 0; public static final int RUNNING_CODE = 1; - public static final String SH = "sh"; - - /** - * log flush interval?output when reach the interval - */ - public static final int DEFAULT_LOG_FLUSH_INTERVAL = 1000; - /** * pstree, get pud and sub pid */ @@ -107,16 +85,6 @@ private TaskConstants() { */ public static final String PARAMETER_DATETIME = DateConstants.PARAMETER_DATETIME; - /** - * system date(yyyymmdd) today - */ - public static final String PARAMETER_CURRENT_DATE = DateConstants.PARAMETER_CURRENT_DATE; - - /** - * system date(yyyymmdd) yesterday - */ - public static final String PARAMETER_BUSINESS_DATE = DateConstants.PARAMETER_BUSINESS_DATE; - /** * the absolute path of current executing task */ @@ -194,7 +162,6 @@ private TaskConstants() { public static final String SUBTRACT_STRING = "-"; public static final String LOCAL_PARAMS_LIST = "localParamsList"; public static final String TASK_TYPE = "taskType"; - public static final String QUEUE = "queue"; public static final int DEFAULT_DISPLAY_ROWS = 10; public static final String JAR = "jar"; @@ -216,8 +183,6 @@ private TaskConstants() { public static final String HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE = "hadoop.security.authentication.startup.state"; - public static final String TASK_TYPE_DATA_QUALITY = "DATA_QUALITY"; - public static final Set TASK_TYPE_SET_K8S = Sets.newHashSet("K8S", "KUBEFLOW"); /** @@ -242,7 +207,6 @@ private TaskConstants() { public static final String TASK_INSTANCE_ID = "taskInstanceId"; public static final String MI = "Mi"; public static final int JOB_TTL_SECONDS = 300; - public static final int LOG_LINES = 500; public static final String NAMESPACE_NAME = "name"; public static final String CLUSTER = "cluster"; @@ -256,9 +220,6 @@ private TaskConstants() { */ public static final String CONDA_PATH = "conda.path"; - // Loop task constants - public static final Duration DEFAULT_LOOP_STATUS_INTERVAL = Duration.ofSeconds(5L); - /** * sql params regex */ @@ -281,6 +242,6 @@ private TaskConstants() { public static final String WORKFLOW_INSTANCE_ID_MDC_KEY = "workflowInstanceId"; public static final String TASK_INSTANCE_ID_MDC_KEY = "taskInstanceId"; - public static final String STAR = "*"; public static final String SENSITIVE_DATA_MASK = "******"; + } diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/am/KubernetesApplicationManager.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/am/KubernetesApplicationManager.java index 899faaa74b2c..edf10932b704 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/am/KubernetesApplicationManager.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/am/KubernetesApplicationManager.java @@ -51,7 +51,6 @@ public class KubernetesApplicationManager implements ApplicationManager { private static final String PENDING = "Pending"; - private static final String RUNNING = "Running"; private static final String FINISH = "Succeeded"; private static final String FAILED = "Failed"; private static final String UNKNOWN = "Unknown"; diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/TaskExecutionStatus.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/TaskExecutionStatus.java index 7ea0d60b1be1..06d1d34bdcbc 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/TaskExecutionStatus.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/TaskExecutionStatus.java @@ -58,10 +58,6 @@ public static TaskExecutionStatus of(int code) { return taskExecutionStatus; } - public boolean isRunning() { - return this == RUNNING_EXECUTION; - } - public boolean isSuccess() { return this == TaskExecutionStatus.SUCCESS; } @@ -86,17 +82,6 @@ public boolean isFinished() { return isSuccess() || isKill() || isFailure() || isPause() || isForceSuccess(); } - public boolean isNeedFaultTolerance() { - return this == NEED_FAULT_TOLERANCE; - } - - public boolean shouldFailover() { - return SUBMITTED_SUCCESS == this - || DISPATCH == this - || RUNNING_EXECUTION == this - || DELAY_EXECUTION == this; - } - @EnumValue private final int code; private final String desc; diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/TaskTimeoutParameter.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/TaskTimeoutParameter.java index 2644c39264e2..3bc048d3ab94 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/TaskTimeoutParameter.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/TaskTimeoutParameter.java @@ -55,13 +55,6 @@ public void setInterval(int interval) { this.interval = interval; } - public TaskTimeoutParameter() { - } - - public TaskTimeoutParameter(boolean enable) { - this.enable = enable; - } - public TaskTimeoutParameter(boolean enable, TaskTimeoutStrategy strategy, int interval) { this.enable = enable; this.strategy = strategy; diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parser/PropertyPlaceholderHelper.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parser/PropertyPlaceholderHelper.java index dbf484fc0517..11395781da8a 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parser/PropertyPlaceholderHelper.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parser/PropertyPlaceholderHelper.java @@ -56,16 +56,6 @@ public class PropertyPlaceholderHelper { private final boolean ignoreUnresolvablePlaceholders; - /** - * Creates a new {@code PropertyPlaceholderHelper} that uses the supplied prefix and suffix. - * Unresolvable placeholders are ignored. - * @param placeholderPrefix the prefix that denotes the start of a placeholder - * @param placeholderSuffix the suffix that denotes the end of a placeholder - */ - public PropertyPlaceholderHelper(String placeholderPrefix, String placeholderSuffix) { - this(placeholderPrefix, placeholderSuffix, null, true); - } - /** * Creates a new {@code PropertyPlaceholderHelper} that uses the supplied prefix and suffix. * @param placeholderPrefix the prefix that denotes the start of a placeholder @@ -92,24 +82,6 @@ public PropertyPlaceholderHelper(String placeholderPrefix, String placeholderSuf this.ignoreUnresolvablePlaceholders = ignoreUnresolvablePlaceholders; } - /** - * Replaces all placeholders of format {@code ${name}} with the corresponding - * property from the supplied {@link Properties}. - * @param value the value containing the placeholders to be replaced - * @param properties the {@code Properties} to use for replacement - * @return the supplied value with placeholders replaced inline - */ - public String replacePlaceholders(String value, final Properties properties) { - notNull(properties, "'properties' must not be null"); - return replacePlaceholders(value, new PlaceholderResolver() { - - @Override - public String resolvePlaceholder(String placeholderName) { - return properties.getProperty(placeholderName); - } - }); - } - /** * Replaces all placeholders of format {@code ${name}} with the value returned * from the supplied {@link PlaceholderResolver}. diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/utils/ArgsUtils.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/utils/ArgsUtils.java index 38d5e686c7d0..7c34dc559383 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/utils/ArgsUtils.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/utils/ArgsUtils.java @@ -17,8 +17,6 @@ package org.apache.dolphinscheduler.plugin.task.api.utils; -import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.SINGLE_QUOTES; - public class ArgsUtils { private ArgsUtils() throws IllegalStateException { @@ -29,8 +27,4 @@ public static String escape(String arg) { return arg.replace(" ", "\\ ").replace("\"", "\\\"").replace("'", "\\'"); } - public static String wrapperSingleQuotes(String value) { - return SINGLE_QUOTES + value + SINGLE_QUOTES; - } - } diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/utils/K8sUtils.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/utils/K8sUtils.java index a96f3ebb010e..d4f6370c7f48 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/utils/K8sUtils.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/utils/K8sUtils.java @@ -17,14 +17,9 @@ package org.apache.dolphinscheduler.plugin.task.api.utils; -import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.LOG_LINES; - import org.apache.dolphinscheduler.plugin.task.api.TaskException; -import java.util.List; - import lombok.extern.slf4j.Slf4j; -import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.batch.v1.Job; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClient; @@ -83,27 +78,6 @@ public Watch createBatchJobWatcher(String jobName, Watcher watcher) { } } - public String getPodLog(String jobName, String namespace) { - try { - List podList = client.pods().inNamespace(namespace).list().getItems(); - String podName = null; - for (Pod pod : podList) { - podName = pod.getMetadata().getName(); - if (podName.contains("-") && jobName.equals(podName.substring(0, podName.lastIndexOf("-")))) { - break; - } - } - return client.pods().inNamespace(namespace) - .withName(podName) - .tailingLines(LOG_LINES) - .getLog(Boolean.TRUE); - } catch (Exception e) { - log.error("fail to getPodLog", e); - log.error("response bodies : {}", e.getMessage()); - } - return null; - } - public void buildClient(String configYaml) { try { Config config = Config.fromKubeconfig(configYaml); diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/utils/VarPoolUtils.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/utils/VarPoolUtils.java index 6c8de03a8033..2323e25d3fef 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/utils/VarPoolUtils.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/utils/VarPoolUtils.java @@ -101,15 +101,6 @@ public List mergeVarPool(List> varPools) { return new ArrayList<>(result.values()); } - public String subtractVarPoolJson(String varPool, List subtractVarPool) { - List varPoolList = deserializeVarPool(varPool); - List> subtractVarPoolList = subtractVarPool.stream() - .map(VarPoolUtils::deserializeVarPool) - .collect(Collectors.toList()); - List finalVarPool = subtractVarPool(varPoolList, subtractVarPoolList); - return JSONUtils.toJsonString(finalVarPool); - } - /** * Return the subtracted varpool, which key is in varPool but not in subtractVarPool. */ diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTaskException.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTaskException.java index 86393bf3a6be..28829e2722ab 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTaskException.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTaskException.java @@ -22,15 +22,8 @@ */ public class DinkyTaskException extends RuntimeException { - public DinkyTaskException() { - super(); - } - public DinkyTaskException(String message) { super(message); } - public DinkyTaskException(String message, Throwable cause) { - super(message, cause); - } } diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkConstants.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkConstants.java index c12c0bfce38a..7e9b8c3d657d 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkConstants.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkConstants.java @@ -55,12 +55,8 @@ private FlinkConstants() { public static final String FLINK_TASK_MANAGE_MEM = "-ytm"; public static final String FLINK_MAIN_CLASS = "-c"; public static final String FLINK_PARALLELISM = "-p"; - public static final String FLINK_SHUTDOWN_ON_ATTACHED_EXIT = "-sae"; public static final String FLINK_PYTHON = "-py"; public static final String FLINK_SAVEPOINT = "savepoint"; - public static final String FLINK_METRICS = "metrics"; - public static final String FLINK_OVERVIEW = "overview"; - public static final String FLINK_JOBS = "jobs"; public static final String FLINK_CANCEL = "cancel"; // For Flink SQL public static final String FLINK_FORMAT_EXECUTION_TARGET = "set execution.target=%s"; diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkTask.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkTask.java index baa9e5fd6363..165afe02499f 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkTask.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkTask.java @@ -19,7 +19,6 @@ import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.plugin.task.api.AbstractYarnTask; -import org.apache.dolphinscheduler.plugin.task.api.TaskConstants; 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; @@ -29,8 +28,6 @@ import java.util.List; import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; @@ -42,11 +39,6 @@ public class FlinkTask extends AbstractYarnTask { private TaskExecutionContext taskExecutionContext; - /** - * rules for flink application ID - */ - protected static final Pattern FLINK_APPLICATION_REGEX = Pattern.compile(TaskConstants.FLINK_APPLICATION_REGEX); - public FlinkTask(TaskExecutionContext taskExecutionContext) { super(taskExecutionContext); this.taskExecutionContext = taskExecutionContext; @@ -103,18 +95,4 @@ public AbstractParameters getParameters() { return flinkParameters; } - /** - * find app id - * - * @param line line - * @return appid - */ - protected String findAppId(String line) { - Matcher matcher = FLINK_APPLICATION_REGEX.matcher(line); - if (matcher.find()) { - String str = matcher.group(); - return str.substring(6); - } - return null; - } } diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-java/src/main/java/org/apache/dolphinscheduler/plugin/task/java/exception/RunTypeNotFoundException.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-java/src/main/java/org/apache/dolphinscheduler/plugin/task/java/exception/RunTypeNotFoundException.java index d89369067318..0ec1371e883c 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-java/src/main/java/org/apache/dolphinscheduler/plugin/task/java/exception/RunTypeNotFoundException.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-java/src/main/java/org/apache/dolphinscheduler/plugin/task/java/exception/RunTypeNotFoundException.java @@ -19,23 +19,8 @@ public class RunTypeNotFoundException extends RuntimeException { - public RunTypeNotFoundException() { - super(); - } - public RunTypeNotFoundException(String s) { super(s); } - public RunTypeNotFoundException(String s, Throwable throwable) { - super(s, throwable); - } - - public RunTypeNotFoundException(Throwable throwable) { - super(throwable); - } - - protected RunTypeNotFoundException(String s, Throwable throwable, boolean b, boolean b1) { - super(s, throwable, b, b1); - } } diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-sagemaker/src/main/java/org/apache/dolphinscheduler/plugin/task/sagemaker/SagemakerTaskException.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-sagemaker/src/main/java/org/apache/dolphinscheduler/plugin/task/sagemaker/SagemakerTaskException.java index 92beb5c5c214..269a0724ff66 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-sagemaker/src/main/java/org/apache/dolphinscheduler/plugin/task/sagemaker/SagemakerTaskException.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-sagemaker/src/main/java/org/apache/dolphinscheduler/plugin/task/sagemaker/SagemakerTaskException.java @@ -22,10 +22,6 @@ */ public class SagemakerTaskException extends RuntimeException { - public SagemakerTaskException() { - super(); - } - public SagemakerTaskException(String message) { super(message); } @@ -33,4 +29,5 @@ public SagemakerTaskException(String message) { public SagemakerTaskException(String message, Throwable cause) { super(message, cause); } + } diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkConstants.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkConstants.java index ad6dba8c9026..8056f46d57d0 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkConstants.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkConstants.java @@ -92,8 +92,6 @@ private SparkConstants() { public static final String SPARK_SUBMIT_COMMAND = "${SPARK_HOME}/bin/spark-submit"; - public static final String TYPE_SCRIPT = "SCRIPT"; - public static final String TYPE_FILE = "FILE"; } diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java index 113dfbcd9eb8..53a8433511ea 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java @@ -78,13 +78,6 @@ public class SqlTask extends AbstractTask { private BaseConnectionParam baseConnectionParam; - /** - * create function format - * include replace here which can be compatible with more cases, for example a long-running Spark session in Kyuubi will keep its own temp functions instead of destroying them right away - */ - private static final String CREATE_OR_REPLACE_FUNCTION_FORMAT = - "create or replace temporary function {0} as ''{1}''"; - /** * default query sql limit */ @@ -393,12 +386,10 @@ private PreparedStatement prepareStatementAndBind(Connection connection, SqlBind /** * print replace sql * - * @param content content * @param formatSql format sql - * @param rgex rgex * @param sqlParamsMap sql params map */ - private void printReplacedSql(String content, String formatSql, String rgex, Map sqlParamsMap) { + private void printReplacedSql(String formatSql, Map sqlParamsMap) { // parameter print style log.info("after replace sql , preparing : {}", formatSql); StringBuilder logPrint = new StringBuilder("replaced sql , parameters:"); @@ -480,7 +471,7 @@ private SqlBinds getSqlAndSqlParamsMap(String sql) { String formatSql = ParameterUtils.expandListParameter(sqlParamsMap, sql); sqlBuilder.append(formatSql); // print replace sql - printReplacedSql(sql, formatSql, TaskConstants.SQL_PARAMS_REGEX, sqlParamsMap); + printReplacedSql(formatSql, sqlParamsMap); return new SqlBinds(sqlBuilder.toString(), sqlParamsMap); } diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-zeppelin/src/main/java/org/apache/dolphinscheduler/plugin/task/zeppelin/ZeppelinTaskException.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-zeppelin/src/main/java/org/apache/dolphinscheduler/plugin/task/zeppelin/ZeppelinTaskException.java index 8f445bdbc662..aa37ee16ac68 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-zeppelin/src/main/java/org/apache/dolphinscheduler/plugin/task/zeppelin/ZeppelinTaskException.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-zeppelin/src/main/java/org/apache/dolphinscheduler/plugin/task/zeppelin/ZeppelinTaskException.java @@ -22,15 +22,8 @@ */ public class ZeppelinTaskException extends RuntimeException { - public ZeppelinTaskException() { - super(); - } - public ZeppelinTaskException(String message) { super(message); } - public ZeppelinTaskException(String message, Throwable cause) { - super(message, cause); - } }