From fc3dc7110f2e2be6c9f446469c11ac83d70dba56 Mon Sep 17 00:00:00 2001 From: Tboy Date: Mon, 24 Feb 2020 10:29:39 +0800 Subject: [PATCH] Refactor worker (#5) * Refactor worker (#2000) * Refactor worker (#2) * Refactor worker (#1993) * Refactor worker (#1) * add TaskResponseProcessor (#1983) * 1, master persistent task 2. extract master and worker communication model (#1992) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error Co-authored-by: qiaozhanwei * updates Co-authored-by: qiaozhanwei * TaskExecutionContext create modify (#1994) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify Co-authored-by: qiaozhanwei * updates * add- register processor Co-authored-by: qiaozhanwei * buildAckCommand taskInstanceId not set modify (#2002) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify (#2004) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify Co-authored-by: qiaozhanwei --- .../dolphinscheduler/dao/datasource/BaseDataSource.java | 1 + .../dolphinscheduler/dao/datasource/DB2ServerDataSource.java | 2 +- .../dolphinscheduler/dao/datasource/HiveDataSource.java | 2 +- .../dolphinscheduler/dao/datasource/MySQLDataSource.java | 2 +- .../dolphinscheduler/dao/datasource/OracleDataSource.java | 2 +- .../dolphinscheduler/dao/datasource/PostgreDataSource.java | 2 +- .../dolphinscheduler/dao/datasource/SQLServerDataSource.java | 2 +- .../dolphinscheduler/dao/datasource/SparkDataSource.java | 2 +- .../org/apache/dolphinscheduler/dao/entity/TaskInstance.java | 5 ----- .../apache/dolphinscheduler/dao/mapper/ResourceMapper.java | 3 ++- .../apache/dolphinscheduler/dao/mapper/ScheduleMapper.java | 4 ++-- .../apache/dolphinscheduler/dao/mapper/UdfFuncMapper.java | 5 +++-- 12 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/BaseDataSource.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/BaseDataSource.java index a46e5aabcc..fc6d90cc4f 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/BaseDataSource.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/BaseDataSource.java @@ -57,6 +57,7 @@ public abstract class BaseDataSource { public void setPrincipal(String principal) { this.principal = principal; } + /** * test whether the data source can be connected successfully * @throws Exception diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/DB2ServerDataSource.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/DB2ServerDataSource.java index 3c2366b5b0..d9c67edab4 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/DB2ServerDataSource.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/DB2ServerDataSource.java @@ -33,7 +33,7 @@ public class DB2ServerDataSource extends BaseDataSource { /** * gets the JDBC url for the data source connection - * @return + * @return jdbc url */ @Override public String getJdbcUrl() { diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/HiveDataSource.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/HiveDataSource.java index 0a8f527536..840c07e110 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/HiveDataSource.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/HiveDataSource.java @@ -34,7 +34,7 @@ public class HiveDataSource extends BaseDataSource { /** * gets the JDBC url for the data source connection - * @return + * @return jdbc url */ @Override public String getJdbcUrl() { diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/MySQLDataSource.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/MySQLDataSource.java index 6e2fbe3dd8..28c1313d1e 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/MySQLDataSource.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/MySQLDataSource.java @@ -34,7 +34,7 @@ public class MySQLDataSource extends BaseDataSource { /** * gets the JDBC url for the data source connection - * @return + * @return jdbc url */ @Override public String getJdbcUrl() { diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/OracleDataSource.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/OracleDataSource.java index cefaf879b5..31f1f906a5 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/OracleDataSource.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/OracleDataSource.java @@ -33,7 +33,7 @@ public class OracleDataSource extends BaseDataSource { /** * gets the JDBC url for the data source connection - * @return + * @return jdbc url */ @Override public String getJdbcUrl() { diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/PostgreDataSource.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/PostgreDataSource.java index 176cba2587..d4d84e617d 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/PostgreDataSource.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/PostgreDataSource.java @@ -35,7 +35,7 @@ public class PostgreDataSource extends BaseDataSource { /** * gets the JDBC url for the data source connection - * @return + * @return jdbc url */ @Override public String getJdbcUrl() { diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SQLServerDataSource.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SQLServerDataSource.java index 07770c06a7..2815e50d1c 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SQLServerDataSource.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SQLServerDataSource.java @@ -33,7 +33,7 @@ public class SQLServerDataSource extends BaseDataSource { /** * gets the JDBC url for the data source connection - * @return + * @return jdbc url */ @Override public String getJdbcUrl() { diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SparkDataSource.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SparkDataSource.java index 81a5ac6f04..589dbc62c6 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SparkDataSource.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SparkDataSource.java @@ -34,7 +34,7 @@ public class SparkDataSource extends BaseDataSource { /** * gets the JDBC url for the data source connection - * @return + * @return jdbc url */ @Override public String getJdbcUrl() { diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java index c9481baf94..428f5d4cad 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java @@ -155,20 +155,17 @@ public class TaskInstance implements Serializable { /** * duration - * @return */ @TableField(exist = false) private Long duration; /** * max retry times - * @return */ private int maxRetryTimes; /** * task retry interval, unit: minute - * @return */ private int retryInterval; @@ -185,7 +182,6 @@ public class TaskInstance implements Serializable { /** * dependent state - * @return */ @TableField(exist = false) private String dependentResult; @@ -193,7 +189,6 @@ public class TaskInstance implements Serializable { /** * worker group id - * @return */ private int workerGroupId; diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.java index cf65e5d08a..36223daf20 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.java @@ -87,7 +87,8 @@ public interface ResourceMapper extends BaseMapper { /** * list authorized resource * @param userId userId - * @param resNames resource names + * @param resNames resNames + * @param T * @return resource list */ List listAuthorizedResource(@Param("userId") int userId,@Param("resNames")T[] resNames); diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.java index 8a49c8ff4f..225677d152 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.java @@ -62,8 +62,8 @@ public interface ScheduleMapper extends BaseMapper { /** * query schedule list by process definition id - * @param processDefinitionId - * @return + * @param processDefinitionId processDefinitionId + * @return schedule list */ List queryReleaseSchedulerListByProcessDefinitionId(@Param("processDefinitionId") int processDefinitionId); diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.java index 5a8734233c..f6a92681ec 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.java @@ -81,8 +81,9 @@ public interface UdfFuncMapper extends BaseMapper { /** * list authorized UDF function * @param userId userId - * @param udfIds UDF function id array - * @return UDF function list + * @param udfIds udfIds + * @param T + * @return Udf function list */ List listAuthorizedUdfFunc (@Param("userId") int userId,@Param("udfIds")T[] udfIds);