You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ke...@apache.org on 2021/12/23 01:53:41 UTC
[dolphinscheduler] branch dev updated: [Improvement] Merge redundant codes (#7550)
This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 6ae46f2 [Improvement] Merge redundant codes (#7550)
6ae46f2 is described below
commit 6ae46f2c1b8c672a2fb5b1be361dbf5478c9e8e0
Author: J·Y <ji...@gmail.com>
AuthorDate: Thu Dec 23 09:53:33 2021 +0800
[Improvement] Merge redundant codes (#7550)
---
.../plugin/task/api/AbstractYarnTask.java | 18 ++++++++++++++++++
.../dolphinscheduler/plugin/task/flink/FlinkTask.java | 14 +++-----------
.../dolphinscheduler/plugin/task/mr/MapReduceTask.java | 14 +++-----------
.../dolphinscheduler/plugin/task/spark/SparkTask.java | 15 +--------------
4 files changed, 25 insertions(+), 36 deletions(-)
diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractYarnTask.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractYarnTask.java
index b68fe1b..303ea03 100644
--- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractYarnTask.java
+++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractYarnTask.java
@@ -17,6 +17,7 @@
package org.apache.dolphinscheduler.plugin.task.api;
+import org.apache.dolphinscheduler.spi.task.ResourceInfo;
import org.apache.dolphinscheduler.spi.task.request.TaskRequest;
/**
@@ -80,4 +81,21 @@ public abstract class AbstractYarnTask extends AbstractTaskExecutor {
* set main jar name
*/
protected abstract void setMainJarName();
+
+ /**
+ * Get name of jar resource.
+ *
+ * @param mainJar
+ * @return
+ */
+ protected String getResourceNameOfMainJar(ResourceInfo mainJar) {
+ if (null == mainJar) {
+ throw new RuntimeException("The jar for the task is required.");
+ }
+
+ return mainJar.getId() == 0
+ ? mainJar.getRes()
+ // when update resource maybe has error
+ : mainJar.getResourceName().replaceFirst("/", "");
+ }
}
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 10882e0..6b77a3e 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
@@ -116,17 +116,9 @@ public class FlinkTask extends AbstractYarnTask {
protected void setMainJarName() {
// main jar
ResourceInfo mainJar = flinkParameters.getMainJar();
- if (mainJar != null) {
- int resourceId = mainJar.getId();
- String resourceName;
- if (resourceId == 0) {
- resourceName = mainJar.getRes();
- } else {
- resourceName = mainJar.getResourceName().replaceFirst("/", "");
- }
- mainJar.setRes(resourceName);
- flinkParameters.setMainJar(mainJar);
- }
+ String resourceName = getResourceNameOfMainJar(mainJar);
+ mainJar.setRes(resourceName);
+ flinkParameters.setMainJar(mainJar);
}
@Override
diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-mr/src/main/java/org/apache/dolphinscheduler/plugin/task/mr/MapReduceTask.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-mr/src/main/java/org/apache/dolphinscheduler/plugin/task/mr/MapReduceTask.java
index 615617d..350de7d 100644
--- a/dolphinscheduler-task-plugin/dolphinscheduler-task-mr/src/main/java/org/apache/dolphinscheduler/plugin/task/mr/MapReduceTask.java
+++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-mr/src/main/java/org/apache/dolphinscheduler/plugin/task/mr/MapReduceTask.java
@@ -119,17 +119,9 @@ public class MapReduceTask extends AbstractYarnTask {
protected void setMainJarName() {
// main jar
ResourceInfo mainJar = mapreduceParameters.getMainJar();
- if (mainJar != null) {
- int resourceId = mainJar.getId();
- String resourceName;
- if (resourceId == 0) {
- resourceName = mainJar.getRes();
- } else {
- resourceName = mainJar.getResourceName().replaceFirst("/", "");
- }
- mainJar.setRes(resourceName);
- mapreduceParameters.setMainJar(mainJar);
- }
+ String resourceName = getResourceNameOfMainJar(mainJar);
+ mainJar.setRes(resourceName);
+ mapreduceParameters.setMainJar(mainJar);
}
@Override
diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTask.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTask.java
index 6255581..b6190fa 100644
--- a/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTask.java
+++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTask.java
@@ -121,22 +121,9 @@ public class SparkTask extends AbstractYarnTask {
protected void setMainJarName() {
// main jar
ResourceInfo mainJar = sparkParameters.getMainJar();
-
- if (null == mainJar) {
- throw new RuntimeException("Spark task jar params is null");
- }
-
- int resourceId = mainJar.getId();
- String resourceName;
- if (resourceId == 0) {
- resourceName = mainJar.getRes();
- } else {
- //when update resource maybe has error
- resourceName = mainJar.getResourceName().replaceFirst("/", "");
- }
+ String resourceName = getResourceNameOfMainJar(mainJar);
mainJar.setRes(resourceName);
sparkParameters.setMainJar(mainJar);
-
}
@Override