Browse Source

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
pull/3/MERGE
qiaozhanwei 5 years ago committed by gaojun2048
parent
commit
8b990b5c1c
  1. 1
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/BaseDataSource.java
  2. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/DB2ServerDataSource.java
  3. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/HiveDataSource.java
  4. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/MySQLDataSource.java
  5. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/OracleDataSource.java
  6. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/PostgreDataSource.java
  7. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SQLServerDataSource.java
  8. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SparkDataSource.java
  9. 5
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java
  10. 3
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.java
  11. 4
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.java
  12. 5
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.java

1
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) { public void setPrincipal(String principal) {
this.principal = principal; this.principal = principal;
} }
/** /**
* test whether the data source can be connected successfully * test whether the data source can be connected successfully
* @throws Exception * @throws Exception

2
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 * gets the JDBC url for the data source connection
* @return * @return jdbc url
*/ */
@Override @Override
public String getJdbcUrl() { public String getJdbcUrl() {

2
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 * gets the JDBC url for the data source connection
* @return * @return jdbc url
*/ */
@Override @Override
public String getJdbcUrl() { public String getJdbcUrl() {

2
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 * gets the JDBC url for the data source connection
* @return * @return jdbc url
*/ */
@Override @Override
public String getJdbcUrl() { public String getJdbcUrl() {

2
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 * gets the JDBC url for the data source connection
* @return * @return jdbc url
*/ */
@Override @Override
public String getJdbcUrl() { public String getJdbcUrl() {

2
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 * gets the JDBC url for the data source connection
* @return * @return jdbc url
*/ */
@Override @Override
public String getJdbcUrl() { public String getJdbcUrl() {

2
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 * gets the JDBC url for the data source connection
* @return * @return jdbc url
*/ */
@Override @Override
public String getJdbcUrl() { public String getJdbcUrl() {

2
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 * gets the JDBC url for the data source connection
* @return * @return jdbc url
*/ */
@Override @Override
public String getJdbcUrl() { public String getJdbcUrl() {

5
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java

@ -154,20 +154,17 @@ public class TaskInstance {
/** /**
* duration * duration
* @return
*/ */
@TableField(exist = false) @TableField(exist = false)
private Long duration; private Long duration;
/** /**
* max retry times * max retry times
* @return
*/ */
private int maxRetryTimes; private int maxRetryTimes;
/** /**
* task retry interval, unit: minute * task retry interval, unit: minute
* @return
*/ */
private int retryInterval; private int retryInterval;
@ -184,7 +181,6 @@ public class TaskInstance {
/** /**
* dependent state * dependent state
* @return
*/ */
@TableField(exist = false) @TableField(exist = false)
private String dependentResult; private String dependentResult;
@ -192,7 +188,6 @@ public class TaskInstance {
/** /**
* worker group id * worker group id
* @return
*/ */
private int workerGroupId; private int workerGroupId;

3
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.java

@ -88,7 +88,8 @@ public interface ResourceMapper extends BaseMapper<Resource> {
/** /**
* list authorized resource * list authorized resource
* @param userId userId * @param userId userId
* @param resNames resource names * @param resNames resNames
* @param <T> T
* @return resource list * @return resource list
*/ */
<T> List<Resource> listAuthorizedResource(@Param("userId") int userId,@Param("resNames")T[] resNames); <T> List<Resource> listAuthorizedResource(@Param("userId") int userId,@Param("resNames")T[] resNames);

4
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 * query schedule list by process definition id
* @param processDefinitionId * @param processDefinitionId processDefinitionId
* @return * @return schedule list
*/ */
List<Schedule> queryReleaseSchedulerListByProcessDefinitionId(@Param("processDefinitionId") int processDefinitionId); List<Schedule> queryReleaseSchedulerListByProcessDefinitionId(@Param("processDefinitionId") int processDefinitionId);

5
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 * list authorized UDF function
* @param userId userId * @param userId userId
* @param udfIds UDF function id array * @param udfIds udfIds
* @return UDF function list * @param <T> T
* @return Udf function list
*/ */
<T> List<UdfFunc> listAuthorizedUdfFunc (@Param("userId") int userId,@Param("udfIds")T[] udfIds); <T> List<UdfFunc> listAuthorizedUdfFunc (@Param("userId") int userId,@Param("udfIds")T[] udfIds);

Loading…
Cancel
Save