You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by jo...@apache.org on 2020/02/24 02:20:40 UTC
[incubator-dolphinscheduler] branch refactor-worker updated: java
doc error modify (#2004)
This is an automated email from the ASF dual-hosted git repository.
journey pushed a commit to branch refactor-worker
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/refactor-worker by this push:
new b7bfd2d java doc error modify (#2004)
b7bfd2d is described below
commit b7bfd2d6f7995727014ade08a2c13a408168fa83
Author: qiaozhanwei <qi...@outlook.com>
AuthorDate: Mon Feb 24 10:20:30 2020 +0800
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
---
.../org/apache/dolphinscheduler/dao/datasource/BaseDataSource.java | 1 +
.../apache/dolphinscheduler/dao/datasource/DB2ServerDataSource.java | 2 +-
.../org/apache/dolphinscheduler/dao/datasource/HiveDataSource.java | 2 +-
.../org/apache/dolphinscheduler/dao/datasource/MySQLDataSource.java | 2 +-
.../org/apache/dolphinscheduler/dao/datasource/OracleDataSource.java | 2 +-
.../apache/dolphinscheduler/dao/datasource/PostgreDataSource.java | 2 +-
.../apache/dolphinscheduler/dao/datasource/SQLServerDataSource.java | 2 +-
.../org/apache/dolphinscheduler/dao/datasource/SparkDataSource.java | 2 +-
.../java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java | 5 -----
.../java/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.java | 3 ++-
.../java/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.java | 4 ++--
.../java/org/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 a46e5aa..fc6d90c 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 3c2366b..d9c67ed 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 0a8f527..840c07e 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 6e2fbe3..28c1313 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 cefaf87..31f1f90 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 176cba2..d4d84e6 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 07770c0..2815e50 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 81a5ac6..589dbc6 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 c9481ba..428f5d4 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 cf65e5d..36223da 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<Resource> {
/**
* list authorized resource
* @param userId userId
- * @param resNames resource names
+ * @param resNames resNames
+ * @param <T> T
* @return resource list
*/
<T> List<Resource> 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 8a49c8f..225677d 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<Schedule> {
/**
* query schedule list by process definition id
- * @param processDefinitionId
- * @return
+ * @param processDefinitionId processDefinitionId
+ * @return schedule list
*/
List<Schedule> 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 5a87342..f6a9268 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<UdfFunc> {
/**
* list authorized UDF function
* @param userId userId
- * @param udfIds UDF function id array
- * @return UDF function list
+ * @param udfIds udfIds
+ * @param <T> T
+ * @return Udf function list
*/
<T> List<UdfFunc> listAuthorizedUdfFunc (@Param("userId") int userId,@Param("udfIds")T[] udfIds);