Browse Source

[Improvement-5785][common] Fix code format (#6864)

* [DS-5785][style] Fix common module code format

* [DS-5785][style] Fix common module code format
3.0.0/version-upgrade
lvshaokang 3 years ago committed by GitHub
parent
commit
1a88b1863b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertStatus.java
  2. 4
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertType.java
  3. 3
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AuthorizationType.java
  4. 8
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java
  5. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CycleEnum.java
  6. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DataType.java
  7. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DependResult.java
  8. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DependentRelation.java
  9. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Direct.java
  10. 47
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/FailureStrategy.java
  11. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java
  12. 15
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpCheckCondition.java
  13. 17
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpMethod.java
  14. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpParametersType.java
  15. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/NodeType.java
  16. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Priority.java
  17. 2
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ProgramType.java
  18. 7
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ReleaseState.java
  19. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ResUploadType.java
  20. 3
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/RunMode.java
  21. 3
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/SparkVersion.java
  22. 3
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/SqoopJobType.java
  23. 43
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskDependType.java
  24. 2
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskRecordStatus.java
  25. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskStateType.java
  26. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskTimeoutStrategy.java
  27. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskType.java
  28. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UdfType.java
  29. 4
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UserType.java
  30. 48
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/WarningType.java
  31. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/graph/DAG.java
  32. 16
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java
  33. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DependentTaskModel.java
  34. 8
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/Server.java
  35. 90
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNodeRelation.java
  36. 2
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/WorkerServerModel.java
  37. 186
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/HttpProperty.java
  38. 105
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/ProcessDag.java
  39. 218
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/Property.java
  40. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/ResourceInfo.java
  41. 594
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/shell/AbstractShell.java
  42. 9
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/shell/ShellExecutor.java
  43. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/AbstractParameters.java
  44. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/IParameters.java
  45. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/TaskTimeoutParameter.java
  46. 3
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/dependent/DependentParameters.java
  47. 4
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/http/HttpParameters.java
  48. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/mr/MapReduceParameters.java
  49. 72
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/python/PythonParameters.java
  50. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlBinds.java
  51. 2
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlType.java
  52. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/SqoopParameters.java
  53. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/sources/SourceHdfsParameter.java
  54. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/sources/SourceHiveParameter.java
  55. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/sources/SourceMysqlParameter.java
  56. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/targets/TargetHdfsParameter.java
  57. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/targets/TargetHiveParameter.java
  58. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/targets/TargetMysqlParameter.java
  59. 2
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/subprocess/SubProcessParameters.java
  60. 21
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/Stopper.java
  61. 3
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadUtils.java
  62. 2
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DependentUtils.java
  63. 2
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java
  64. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java
  65. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ScriptRunner.java
  66. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/TriFunction.java

4
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertStatus.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
@ -29,8 +30,7 @@ public enum AlertStatus {
EXECUTION_SUCCESS(1, "execute successfully"), EXECUTION_SUCCESS(1, "execute successfully"),
EXECUTION_FAILURE(2, "execute failed"); EXECUTION_FAILURE(2, "execute failed");
AlertStatus(int code, String descp) {
AlertStatus(int code, String descp){
this.code = code; this.code = code;
this.descp = descp; this.descp = descp;
} }

4
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertType.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
@ -28,8 +29,7 @@ public enum AlertType {
EMAIL(0, "email"), EMAIL(0, "email"),
SMS(1, "SMS"); SMS(1, "SMS");
AlertType(int code, String descp) {
AlertType(int code, String descp){
this.code = code; this.code = code;
this.descp = descp; this.descp = descp;
} }

3
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AuthorizationType.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
@ -35,7 +36,7 @@ public enum AuthorizationType {
DATASOURCE(3, "data source"), DATASOURCE(3, "data source"),
UDF(4, "udf function"); UDF(4, "udf function");
AuthorizationType(int code, String descp){ AuthorizationType(int code, String descp) {
this.code = code; this.code = code;
this.descp = descp; this.descp = descp;
} }

8
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java

@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; package org.apache.dolphinscheduler.common.enums;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.baomidou.mybatisplus.annotation.EnumValue;
/** /**
* command types * command types
*/ */
@ -54,7 +55,7 @@ public enum CommandType {
RECOVER_SERIAL_WAIT(11, "recover serial wait"), RECOVER_SERIAL_WAIT(11, "recover serial wait"),
; ;
CommandType(int code, String descp){ CommandType(int code, String descp) {
this.code = code; this.code = code;
this.descp = descp; this.descp = descp;
} }
@ -79,7 +80,6 @@ public enum CommandType {
} }
} }
public static CommandType of(Integer status) { public static CommandType of(Integer status) {
if (COMMAND_TYPE_MAP.containsKey(status)) { if (COMMAND_TYPE_MAP.containsKey(status)) {
return COMMAND_TYPE_MAP.get(status); return COMMAND_TYPE_MAP.get(status);

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CycleEnum.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
/** /**

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DataType.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
/** /**

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DependResult.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
/** /**

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DependentRelation.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
/** /**

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Direct.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
/** /**

47
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/FailureStrategy.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
@ -23,27 +24,27 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
*/ */
public enum FailureStrategy { public enum FailureStrategy {
/** /**
* 0 ending process when some tasks failed. * 0 ending process when some tasks failed.
* 1 continue running when some tasks failed. * 1 continue running when some tasks failed.
**/ **/
END(0, "end"), END(0, "end"),
CONTINUE(1, "continue"); CONTINUE(1, "continue");
FailureStrategy(int code, String descp){ FailureStrategy(int code, String descp) {
this.code = code; this.code = code;
this.descp = descp; this.descp = descp;
} }
@EnumValue @EnumValue
private final int code; private final int code;
private final String descp; private final String descp;
public int getCode() { public int getCode() {
return code; return code;
} }
public String getDescp() { public String getDescp() {
return descp; return descp;
} }
} }

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;

15
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpCheckCondition.java

@ -14,17 +14,18 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
/** /**
* http check condition * http check condition
*/ */
public enum HttpCheckCondition { public enum HttpCheckCondition {
/** /**
* 0 status_code_default:200 * 0 status_code_default:200
* 1 status_code_custom * 1 status_code_custom
* 2 body_contains * 2 body_contains
* 3 body_not_contains * 3 body_not_contains
*/ */
STATUS_CODE_DEFAULT,STATUS_CODE_CUSTOM, BODY_CONTAINS, BODY_NOT_CONTAINS STATUS_CODE_DEFAULT,STATUS_CODE_CUSTOM, BODY_CONTAINS, BODY_NOT_CONTAINS
} }

17
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpMethod.java

@ -14,18 +14,19 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
/** /**
* http method * http method
*/ */
public enum HttpMethod { public enum HttpMethod {
/** /**
* 0 get * 0 get
* 1 post * 1 post
* 2 head * 2 head
* 3 put * 3 put
* 4 delete * 4 delete
*/ */
GET, POST, HEAD, PUT, DELETE GET, POST, HEAD, PUT, DELETE
} }

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpParametersType.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
/** /**

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/NodeType.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
public enum NodeType { public enum NodeType {

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Priority.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;

2
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ProgramType.java

@ -14,8 +14,8 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums;
package org.apache.dolphinscheduler.common.enums;
/** /**
* support program types * support program types

7
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ReleaseState.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
@ -30,7 +31,7 @@ public enum ReleaseState {
OFFLINE(0, "offline"), OFFLINE(0, "offline"),
ONLINE(1, "online"); ONLINE(1, "online");
ReleaseState(int code, String descp){ ReleaseState(int code, String descp) {
this.code = code; this.code = code;
this.descp = descp; this.descp = descp;
} }
@ -39,9 +40,9 @@ public enum ReleaseState {
private final int code; private final int code;
private final String descp; private final String descp;
public static ReleaseState getEnum(int value){ public static ReleaseState getEnum(int value) {
for (ReleaseState e:ReleaseState.values()) { for (ReleaseState e:ReleaseState.values()) {
if(e.ordinal() == value) { if (e.ordinal() == value) {
return e; return e;
} }
} }

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ResUploadType.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
/** /**

3
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/RunMode.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
@ -29,7 +30,7 @@ public enum RunMode {
RUN_MODE_SERIAL(0, "serial run"), RUN_MODE_SERIAL(0, "serial run"),
RUN_MODE_PARALLEL(1, "parallel run"); RUN_MODE_PARALLEL(1, "parallel run");
RunMode(int code, String descp){ RunMode(int code, String descp) {
this.code = code; this.code = code;
this.descp = descp; this.descp = descp;
} }

3
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/SparkVersion.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
@ -27,7 +28,7 @@ public enum SparkVersion {
SPARK1(0, "SPARK1"), SPARK1(0, "SPARK1"),
SPARK2(1, "SPARK2"); SPARK2(1, "SPARK2");
SparkVersion(int code, String descp){ SparkVersion(int code, String descp) {
this.code = code; this.code = code;
this.descp = descp; this.descp = descp;
} }

3
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/SqoopJobType.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
@ -22,7 +23,7 @@ public enum SqoopJobType {
CUSTOM(0, "CUSTOM"), CUSTOM(0, "CUSTOM"),
TEMPLATE(1, "TEMPLATE"); TEMPLATE(1, "TEMPLATE");
SqoopJobType(int code, String descp){ SqoopJobType(int code, String descp) {
this.code = code; this.code = code;
this.descp = descp; this.descp = descp;
} }

43
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskDependType.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
@ -22,29 +23,29 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
* task node depend type * task node depend type
*/ */
public enum TaskDependType { public enum TaskDependType {
/** /**
* 0 run current tasks only * 0 run current tasks only
* 1 run current tasks and previous tasks * 1 run current tasks and previous tasks
* 2 run current tasks and the other tasks that depend on current tasks; * 2 run current tasks and the other tasks that depend on current tasks;
*/ */
TASK_ONLY(0, "task only"), TASK_ONLY(0, "task only"),
TASK_PRE(1, "task pre"), TASK_PRE(1, "task pre"),
TASK_POST(2, "task post"); TASK_POST(2, "task post");
TaskDependType(int code, String descp){ TaskDependType(int code, String descp) {
this.code = code; this.code = code;
this.descp = descp; this.descp = descp;
} }
@EnumValue @EnumValue
private final int code; private final int code;
private final String descp; private final String descp;
public int getCode() { public int getCode() {
return code; return code;
} }
public String getDescp() { public String getDescp() {
return descp; return descp;
} }
} }

2
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskRecordStatus.java

@ -14,8 +14,8 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums;
package org.apache.dolphinscheduler.common.enums;
/** /**
* task record status * task record status

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskStateType.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
/** /**

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskTimeoutStrategy.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskType.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UdfType.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;

4
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UserType.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
@ -28,8 +29,7 @@ public enum UserType {
ADMIN_USER(0, "admin user"), ADMIN_USER(0, "admin user"),
GENERAL_USER(1, "general user"); GENERAL_USER(1, "general user");
UserType(int code, String descp) {
UserType(int code, String descp){
this.code = code; this.code = code;
this.descp = descp; this.descp = descp;
} }

48
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/WarningType.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
@ -22,32 +23,31 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
* types for whether to send warning when process ending; * types for whether to send warning when process ending;
*/ */
public enum WarningType { public enum WarningType {
/** /**
* 0 do not send warning; * 0 do not send warning;
* 1 send if process success; * 1 send if process success;
* 2 send if process failed; * 2 send if process failed;
* 3 send if process ending; * 3 send if process ending;
*/ */
NONE(0, "none"), NONE(0, "none"),
SUCCESS(1, "success"), SUCCESS(1, "success"),
FAILURE(2, "failure"), FAILURE(2, "failure"),
ALL(3, "all"); ALL(3, "all");
WarningType(int code, String descp){ WarningType(int code, String descp) {
this.code = code; this.code = code;
this.descp = descp; this.descp = descp;
} }
@EnumValue @EnumValue
private final int code; private final int code;
private final String descp; private final String descp;
public int getCode() { public int getCode() {
return code; return code;
} }
public String getDescp() { public String getDescp() {
return descp; return descp;
} }
} }

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/graph/DAG.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.graph; package org.apache.dolphinscheduler.common.graph;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;

16
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java

@ -14,26 +14,26 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.model;
import com.fasterxml.jackson.annotation.JsonFormat; package org.apache.dolphinscheduler.common.model;
import java.util.Date; import java.util.Date;
import java.util.Objects; import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonFormat;
/** /**
* date interval class * date interval class
*/ */
public class DateInterval { public class DateInterval {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date startTime; private Date startTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date endTime; private Date endTime;
public DateInterval(Date beginTime, Date endTime){ public DateInterval(Date beginTime, Date endTime) {
this.startTime = beginTime; this.startTime = beginTime;
this.endTime = endTime; this.endTime = endTime;
} }
@Override @Override
@ -44,8 +44,8 @@ public class DateInterval {
return true; return true;
} else { } else {
DateInterval that = (DateInterval) obj; DateInterval that = (DateInterval) obj;
return startTime.equals(that.startTime) && return startTime.equals(that.startTime)
endTime.equals(that.endTime); && endTime.equals(that.endTime);
} }
} }

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DependentTaskModel.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.model; package org.apache.dolphinscheduler.common.model;
import org.apache.dolphinscheduler.common.enums.DependentRelation; import org.apache.dolphinscheduler.common.enums.DependentRelation;

8
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/Server.java

@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.model; package org.apache.dolphinscheduler.common.model;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
/** /**
* server * server
*/ */
@ -54,13 +54,13 @@ public class Server {
/** /**
* create time * create time
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime; private Date createTime;
/** /**
* laster heart beat time * laster heart beat time
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date lastHeartbeatTime; private Date lastHeartbeatTime;
public int getId() { public int getId() {

90
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNodeRelation.java

@ -14,66 +14,66 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.model; package org.apache.dolphinscheduler.common.model;
import java.util.Objects; import java.util.Objects;
public class TaskNodeRelation { public class TaskNodeRelation {
/** /**
* task start node name * task start node name
*/ */
private String startNode; private String startNode;
/**
* task end node name
*/
private String endNode;
public TaskNodeRelation() { /**
} * task end node name
*/
private String endNode;
public TaskNodeRelation(String startNode, String endNode) { public TaskNodeRelation() {
this.startNode = startNode; }
this.endNode = endNode;
}
public String getStartNode() { public TaskNodeRelation(String startNode, String endNode) {
return startNode; this.startNode = startNode;
} this.endNode = endNode;
}
public void setStartNode(String startNode) { public String getStartNode() {
this.startNode = startNode; return startNode;
} }
public String getEndNode() { public void setStartNode(String startNode) {
return endNode; this.startNode = startNode;
} }
public void setEndNode(String endNode) { public String getEndNode() {
this.endNode = endNode; return endNode;
} }
public void setEndNode(String endNode) {
this.endNode = endNode;
}
@Override @Override
public boolean equals(Object o){ public boolean equals(Object o) {
if (!(o instanceof TaskNodeRelation)) { if (!(o instanceof TaskNodeRelation)) {
return false; return false;
}
TaskNodeRelation relation = (TaskNodeRelation)o;
return (relation.getStartNode().equals(this.startNode) && relation.getEndNode().equals(this.endNode));
} }
TaskNodeRelation relation = (TaskNodeRelation)o;
return (relation.getStartNode().equals(this.startNode) && relation.getEndNode().equals(this.endNode));
}
@Override @Override
public String toString() { public String toString() {
return "TaskNodeRelation{" + return "TaskNodeRelation{"
"startNode='" + startNode + '\'' + + "startNode='" + startNode + '\''
", endNode='" + endNode + '\'' + + ", endNode='" + endNode + '\''
'}'; + '}';
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(startNode, endNode); return Objects.hash(startNode, endNode);
} }
} }

2
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/WorkerServerModel.java

@ -14,8 +14,8 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.model;
package org.apache.dolphinscheduler.common.model;
import java.util.Date; import java.util.Date;
import java.util.Set; import java.util.Set;

186
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/HttpProperty.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.process; package org.apache.dolphinscheduler.common.process;
import org.apache.dolphinscheduler.common.enums.HttpParametersType; import org.apache.dolphinscheduler.common.enums.HttpParametersType;
@ -21,105 +22,102 @@ import org.apache.dolphinscheduler.common.enums.HttpParametersType;
import java.util.Objects; import java.util.Objects;
public class HttpProperty { public class HttpProperty {
/** /**
* key * key
*/ */
private String prop; private String prop;
/** /**
* httpParametersType * httpParametersType
*/ */
private HttpParametersType httpParametersType; private HttpParametersType httpParametersType;
/** /**
* value * value
*/ */
private String value; private String value;
public HttpProperty() { public HttpProperty() {
} }
public HttpProperty(String prop, HttpParametersType httpParametersType, String value) { public HttpProperty(String prop, HttpParametersType httpParametersType, String value) {
this.prop = prop; this.prop = prop;
this.httpParametersType = httpParametersType; this.httpParametersType = httpParametersType;
this.value = value; this.value = value;
}
/**
* getter method
*
* @return the prop
* @see HttpProperty#prop
*/
public String getProp() {
return prop;
}
/**
* setter method
*
* @param prop the prop to set
* @see HttpProperty#prop
*/
public void setProp(String prop) {
this.prop = prop;
}
/**
* getter method
*
* @return the value
* @see HttpProperty#value
*/
public String getValue() {
return value;
}
/**
* setter method
*
* @param value the value to set
* @see HttpProperty#value
*/
public void setValue(String value) {
this.value = value;
}
public HttpParametersType getHttpParametersType() {
return httpParametersType;
}
public void setHttpParametersType(HttpParametersType httpParametersType) {
this.httpParametersType = httpParametersType;
}
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
} }
if (o == null || getClass() != o.getClass()) {
return false; /**
* getter method
*
* @return the prop
* @see HttpProperty#prop
*/
public String getProp() {
return prop;
} }
HttpProperty property = (HttpProperty) o;
return Objects.equals(prop, property.prop) &&
Objects.equals(value, property.value);
}
/**
* setter method
*
* @param prop the prop to set
* @see HttpProperty#prop
*/
public void setProp(String prop) {
this.prop = prop;
}
@Override /**
public int hashCode() { * getter method
return Objects.hash(prop, value); *
} * @return the value
* @see HttpProperty#value
*/
public String getValue() {
return value;
}
@Override /**
public String toString() { * setter method
return "HttpProperty{" + *
"prop='" + prop + '\'' + * @param value the value to set
", httpParametersType=" + httpParametersType + * @see HttpProperty#value
", value='" + value + '\'' + */
'}'; public void setValue(String value) {
} this.value = value;
}
public HttpParametersType getHttpParametersType() {
return httpParametersType;
}
public void setHttpParametersType(HttpParametersType httpParametersType) {
this.httpParametersType = httpParametersType;
}
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
HttpProperty property = (HttpProperty) o;
return Objects.equals(prop, property.prop)
&& Objects.equals(value, property.value);
}
@Override
public int hashCode() {
return Objects.hash(prop, value);
}
@Override
public String toString() {
return "HttpProperty{"
+ "prop='" + prop + '\''
+ ", httpParametersType=" + httpParametersType
+ ", value='" + value + '\''
+ '}';
}
} }

105
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/ProcessDag.java

@ -14,9 +14,8 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.process;
package org.apache.dolphinscheduler.common.process;
import org.apache.dolphinscheduler.common.model.TaskNode; import org.apache.dolphinscheduler.common.model.TaskNode;
import org.apache.dolphinscheduler.common.model.TaskNodeRelation; import org.apache.dolphinscheduler.common.model.TaskNodeRelation;
@ -25,61 +24,61 @@ import java.util.List;
public class ProcessDag { public class ProcessDag {
/** /**
* DAG edge list * DAG edge list
**/ **/
private List<TaskNodeRelation> edges; private List<TaskNodeRelation> edges;
/** /**
* DAG node list * DAG node list
*/ */
private List<TaskNode> nodes; private List<TaskNode> nodes;
/** /**
* getter method * getter method
* *
* @return the edges * @return the edges
* @see ProcessDag#edges * @see ProcessDag#edges
*/ */
public List<TaskNodeRelation> getEdges() { public List<TaskNodeRelation> getEdges() {
return edges; return edges;
} }
/** /**
* setter method * setter method
* *
* @param edges the edges to set * @param edges the edges to set
* @see ProcessDag#edges * @see ProcessDag#edges
*/ */
public void setEdges(List<TaskNodeRelation> edges) { public void setEdges(List<TaskNodeRelation> edges) {
this.edges = edges; this.edges = edges;
} }
/** /**
* getter method * getter method
* *
* @return the nodes * @return the nodes
* @see ProcessDag#nodes * @see ProcessDag#nodes
*/ */
public List<TaskNode> getNodes() { public List<TaskNode> getNodes() {
return nodes; return nodes;
} }
/** /**
* setter method * setter method
* *
* @param nodes the nodes to set * @param nodes the nodes to set
* @see ProcessDag#nodes * @see ProcessDag#nodes
*/ */
public void setNodes(List<TaskNode> nodes) { public void setNodes(List<TaskNode> nodes) {
this.nodes = nodes; this.nodes = nodes;
} }
@Override @Override
public String toString() { public String toString() {
return "ProcessDag{" + return "ProcessDag{"
"edges=" + edges + + "edges=" + edges
", nodes=" + nodes + + ", nodes=" + nodes
'}'; + '}';
} }
} }

218
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/Property.java

@ -14,8 +14,8 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.process;
package org.apache.dolphinscheduler.common.process;
import org.apache.dolphinscheduler.common.enums.DataType; import org.apache.dolphinscheduler.common.enums.DataType;
import org.apache.dolphinscheduler.common.enums.Direct; import org.apache.dolphinscheduler.common.enums.Direct;
@ -24,121 +24,117 @@ import java.io.Serializable;
import java.util.Objects; import java.util.Objects;
public class Property implements Serializable { public class Property implements Serializable {
/** /**
* key * key
*/ */
private String prop; private String prop;
/** /**
* input/output * input/output
*/ */
private Direct direct; private Direct direct;
/** /**
* data type * data type
*/ */
private DataType type; private DataType type;
/** /**
* value * value
*/ */
private String value; private String value;
public Property() { public Property() {
} }
public Property(String prop,Direct direct,DataType type,String value) { public Property(String prop,Direct direct,DataType type,String value) {
this.prop = prop; this.prop = prop;
this.direct = direct; this.direct = direct;
this.type = type; this.type = type;
this.value = value; this.value = value;
} }
/** /**
* getter method * getter method
* *
* @return the prop * @return the prop
* @see Property#prop * @see Property#prop
*/ */
public String getProp() { public String getProp() {
return prop; return prop;
} }
/** /**
* setter method * setter method
* *
* @param prop the prop to set * @param prop the prop to set
* @see Property#prop * @see Property#prop
*/ */
public void setProp(String prop) { public void setProp(String prop) {
this.prop = prop; this.prop = prop;
} }
/** /**
* getter method * getter method
* *
* @return the value * @return the value
* @see Property#value * @see Property#value
*/ */
public String getValue() { public String getValue() {
return value; return value;
}
/**
* setter method
*
* @param value the value to set
* @see Property#value
*/
public void setValue(String value) {
this.value = value;
}
public Direct getDirect() {
return direct;
}
public void setDirect(Direct direct) {
this.direct = direct;
}
public DataType getType() {
return type;
}
public void setType(DataType type) {
this.type = type;
}
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
} }
if (o == null || getClass() != o.getClass()) {
return false; /**
* setter method
*
* @param value the value to set
* @see Property#value
*/
public void setValue(String value) {
this.value = value;
}
public Direct getDirect() {
return direct;
}
public void setDirect(Direct direct) {
this.direct = direct;
} }
Property property = (Property) o;
return Objects.equals(prop, property.prop) &&
Objects.equals(value, property.value);
}
public DataType getType() {
return type;
}
@Override public void setType(DataType type) {
public int hashCode() { this.type = type;
return Objects.hash(prop, value); }
}
@Override @Override
public String toString() { public boolean equals(Object o) {
return "Property{" + if (this == o) {
"prop='" + prop + '\'' + return true;
", direct=" + direct + }
", type=" + type + if (o == null || getClass() != o.getClass()) {
", value='" + value + '\'' + return false;
'}'; }
} Property property = (Property) o;
return Objects.equals(prop, property.prop)
&& Objects.equals(value, property.value);
}
@Override
public int hashCode() {
return Objects.hash(prop, value);
}
@Override
public String toString() {
return "Property{"
+ "prop='" + prop + '\''
+ ", direct=" + direct
+ ", type=" + type
+ ", value='" + value + '\''
+ '}';
}
} }

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/ResourceInfo.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.process; package org.apache.dolphinscheduler.common.process;
/** /**

594
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/shell/AbstractShell.java

@ -14,8 +14,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.shell; package org.apache.dolphinscheduler.common.shell;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -27,10 +31,6 @@ import java.util.TimerTask;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* A base class for running a Unix command. * A base class for running a Unix command.
* *
@ -40,318 +40,316 @@ import org.slf4j.LoggerFactory;
*/ */
public abstract class AbstractShell { public abstract class AbstractShell {
private static final Logger logger = LoggerFactory.getLogger(AbstractShell.class); private static final Logger logger = LoggerFactory.getLogger(AbstractShell.class);
/** /**
* Time after which the executing script would be timedout * Time after which the executing script would be timedout
*/ */
protected long timeOutInterval = 0L; protected long timeOutInterval = 0L;
/** /**
* If or not script timed out * If or not script timed out
*/ */
private AtomicBoolean timedOut; private AtomicBoolean timedOut;
/** /**
* refresh interval in msec * refresh interval in msec
*/ */
private long interval; private long interval;
/** /**
* last time the command was performed * last time the command was performed
*/ */
private long lastTime; private long lastTime;
/** /**
* env for the command execution * env for the command execution
*/ */
private Map<String, String> environment; private Map<String, String> environment;
private File dir; private File dir;
/** /**
* sub process used to execute the command * sub process used to execute the command
*/ */
private Process process; private Process process;
private int exitCode; private int exitCode;
/** /**
* If or not script finished executing * If or not script finished executing
*/ */
private AtomicBoolean completed; private AtomicBoolean completed;
public AbstractShell() { public AbstractShell() {
this(0L); this(0L);
}
/**
* @param interval the minimum duration to wait before re-executing the
* command.
*/
public AbstractShell(long interval ) {
this.interval = interval;
this.lastTime = (interval<0) ? 0 : -interval;
}
/**
* set the environment for the command
* @param env Mapping of environment variables
*/
protected void setEnvironment(Map<String, String> env) {
this.environment = env;
}
/**
* set the working directory
* @param dir The directory where the command would be executed
*/
protected void setWorkingDirectory(File dir) {
this.dir = dir;
}
/**
* check to see if a command needs to be executed and execute if needed
* @throws IOException errors
*/
protected void run() throws IOException {
if (lastTime + interval > System.currentTimeMillis()) {
return;
} }
// reset for next run
exitCode = 0; /**
runCommand(); * @param interval the minimum duration to wait before re-executing the
} * command.
*/
public AbstractShell(long interval) {
/** this.interval = interval;
* Run a command actual work this.lastTime = (interval < 0) ? 0 : -interval;
*/
private void runCommand() throws IOException {
ProcessBuilder builder = new ProcessBuilder(getExecString());
Timer timeOutTimer = null;
ShellTimeoutTimerTask timeoutTimerTask = null;
timedOut = new AtomicBoolean(false);
completed = new AtomicBoolean(false);
if (environment != null) {
builder.environment().putAll(this.environment);
} }
if (dir != null) {
builder.directory(this.dir); /**
* set the environment for the command
* @param env Mapping of environment variables
*/
protected void setEnvironment(Map<String, String> env) {
this.environment = env;
} }
process = builder.start(); /**
ProcessContainer.putProcess(process); * set the working directory
* @param dir The directory where the command would be executed
*/
protected void setWorkingDirectory(File dir) {
this.dir = dir;
}
if (timeOutInterval > 0) { /**
timeOutTimer = new Timer(); * check to see if a command needs to be executed and execute if needed
timeoutTimerTask = new ShellTimeoutTimerTask( * @throws IOException errors
this); */
//One time scheduling. protected void run() throws IOException {
timeOutTimer.schedule(timeoutTimerTask, timeOutInterval); if (lastTime + interval > System.currentTimeMillis()) {
return;
}
// reset for next run
exitCode = 0;
runCommand();
} }
final BufferedReader errReader =
new BufferedReader( /**
new InputStreamReader(process.getErrorStream())); * Run a command actual work
BufferedReader inReader = */
new BufferedReader( private void runCommand() throws IOException {
new InputStreamReader(process.getInputStream())); ProcessBuilder builder = new ProcessBuilder(getExecString());
final StringBuilder errMsg = new StringBuilder(); Timer timeOutTimer = null;
ShellTimeoutTimerTask timeoutTimerTask = null;
// read error and input streams as this would free up the buffers timedOut = new AtomicBoolean(false);
// free the error stream buffer completed = new AtomicBoolean(false);
Thread errThread = new Thread() {
@Override if (environment != null) {
public void run() { builder.environment().putAll(this.environment);
}
if (dir != null) {
builder.directory(this.dir);
}
process = builder.start();
ProcessContainer.putProcess(process);
if (timeOutInterval > 0) {
timeOutTimer = new Timer();
timeoutTimerTask = new ShellTimeoutTimerTask(this);
//One time scheduling.
timeOutTimer.schedule(timeoutTimerTask, timeOutInterval);
}
final BufferedReader errReader =
new BufferedReader(
new InputStreamReader(process.getErrorStream()));
BufferedReader inReader =
new BufferedReader(
new InputStreamReader(process.getInputStream()));
final StringBuilder errMsg = new StringBuilder();
// read error and input streams as this would free up the buffers
// free the error stream buffer
Thread errThread = new Thread() {
@Override
public void run() {
try {
String line = errReader.readLine();
while ((line != null) && !isInterrupted()) {
errMsg.append(line);
errMsg.append(System.getProperty("line.separator"));
line = errReader.readLine();
}
} catch (IOException ioe) {
logger.warn("Error reading the error stream", ioe);
}
}
};
Thread inThread = new Thread() {
@Override
public void run() {
try {
parseExecResult(inReader);
} catch (IOException ioe) {
logger.warn("Error reading the in stream", ioe);
}
super.run();
}
};
try { try {
String line = errReader.readLine(); errThread.start();
while((line != null) && !isInterrupted()) { inThread.start();
errMsg.append(line); } catch (IllegalStateException ise) {
errMsg.append(System.getProperty("line.separator")); logger.warn("Illegal while starting the error and in thread", ise);
line = errReader.readLine();
}
} catch(IOException ioe) {
logger.warn("Error reading the error stream", ioe);
} }
}
};
Thread inThread = new Thread() {
@Override
public void run() {
try { try {
parseExecResult(inReader); // parse the output
} catch (IOException ioe) { exitCode = process.waitFor();
logger.warn("Error reading the in stream", ioe); try {
// make sure that the error and in thread exits
errThread.join();
inThread.join();
} catch (InterruptedException ie) {
logger.warn("Interrupted while reading the error and in stream", ie);
}
completed.compareAndSet(false,true);
//the timeout thread handling
//taken care in finally block
if (exitCode != 0 || errMsg.length() > 0) {
throw new ExitCodeException(exitCode, errMsg.toString());
}
} catch (InterruptedException ie) {
throw new IOException(ie.toString());
} finally {
if ((timeOutTimer != null) && !timedOut.get()) {
timeOutTimer.cancel();
}
// close the input stream
try {
inReader.close();
} catch (IOException ioe) {
logger.warn("Error while closing the input stream", ioe);
}
if (!completed.get()) {
errThread.interrupt();
}
try {
errReader.close();
} catch (IOException ioe) {
logger.warn("Error while closing the error stream", ioe);
}
ProcessContainer.removeProcess(process);
process.destroy();
lastTime = System.currentTimeMillis();
} }
super.run();
}
};
try {
errThread.start();
inThread.start();
} catch (IllegalStateException ise) { }
try {
// parse the output
exitCode = process.waitFor();
try {
// make sure that the error and in thread exits
errThread.join();
inThread.join();
} catch (InterruptedException ie) {
logger.warn("Interrupted while reading the error and in stream", ie);
}
completed.compareAndSet(false,true);
//the timeout thread handling
//taken care in finally block
if (exitCode != 0 || errMsg.length() > 0) {
throw new ExitCodeException(exitCode, errMsg.toString());
}
} catch (InterruptedException ie) {
throw new IOException(ie.toString());
} finally {
if ((timeOutTimer!=null) && !timedOut.get()) {
timeOutTimer.cancel();
}
// close the input stream
try {
inReader.close();
} catch (IOException ioe) {
logger.warn("Error while closing the input stream", ioe);
}
if (!completed.get()) {
errThread.interrupt();
}
try {
errReader.close();
} catch (IOException ioe) {
logger.warn("Error while closing the error stream", ioe);
}
ProcessContainer.removeProcess(process);
process.destroy();
lastTime = System.currentTimeMillis();
} }
}
/**
/** *
* * @return an array containing the command name and its parameters
* @return an array containing the command name and its parameters */
*/ protected abstract String[] getExecString();
protected abstract String[] getExecString();
/**
/** * Parse the execution result
* Parse the execution result * @param lines lines
* @param lines lines * @throws IOException errors
* @throws IOException errors */
*/ protected abstract void parseExecResult(BufferedReader lines) throws IOException;
protected abstract void parseExecResult(BufferedReader lines)
throws IOException; /**
* get the current sub-process executing the given command
/** * @return process executing the command
* get the current sub-process executing the given command */
* @return process executing the command public Process getProcess() {
*/ return process;
public Process getProcess() { }
return process;
} /** get the exit code
* @return the exit code of the process
/** get the exit code */
* @return the exit code of the process public int getExitCode() {
*/ return exitCode;
public int getExitCode() {
return exitCode;
}
/**
* Set if the command has timed out.
*
*/
private void setTimedOut() {
this.timedOut.set(true);
}
/**
* Timer which is used to timeout scripts spawned off by shell.
*/
private static class ShellTimeoutTimerTask extends TimerTask {
private AbstractShell shell;
public ShellTimeoutTimerTask(AbstractShell shell) {
this.shell = shell;
} }
@Override /**
public void run() { * Set if the command has timed out.
Process p = shell.getProcess(); *
try { */
p.exitValue(); private void setTimedOut() {
} catch (Exception e) { this.timedOut.set(true);
//Process has not terminated. }
//So check if it has completed
//if not just destroy it. /**
if (p != null && !shell.completed.get()) { * Timer which is used to timeout scripts spawned off by shell.
shell.setTimedOut(); */
p.destroy(); private static class ShellTimeoutTimerTask extends TimerTask {
private AbstractShell shell;
public ShellTimeoutTimerTask(AbstractShell shell) {
this.shell = shell;
}
@Override
public void run() {
Process p = shell.getProcess();
try {
p.exitValue();
} catch (Exception e) {
//Process has not terminated.
//So check if it has completed
//if not just destroy it.
if (p != null && !shell.completed.get()) {
shell.setTimedOut();
p.destroy();
}
}
} }
}
} }
}
/** /**
* This is an IOException with exit code added. * This is an IOException with exit code added.
*/ */
public static class ExitCodeException extends IOException { public static class ExitCodeException extends IOException {
int exitCode; int exitCode;
public ExitCodeException(int exitCode, String message) { public ExitCodeException(int exitCode, String message) {
super(message); super(message);
this.exitCode = exitCode; this.exitCode = exitCode;
}
public int getExitCode() {
return exitCode;
}
} }
public int getExitCode() { /**
return exitCode; * process manage container
*
*/
public static class ProcessContainer extends ConcurrentHashMap<Integer, Process> {
private static final ProcessContainer container = new ProcessContainer();
private ProcessContainer() {
super();
}
public static final ProcessContainer getInstance() {
return container;
}
public static void putProcess(Process process) {
getInstance().put(process.hashCode(), process);
}
public static int processSize() {
return getInstance().size();
}
public static void removeProcess(Process process) {
getInstance().remove(process.hashCode());
}
public static void destroyAllProcess() {
Set<Entry<Integer, Process>> set = getInstance().entrySet();
for (Entry<Integer, Process> entry : set) {
try {
entry.getValue().destroy();
} catch (Exception e) {
logger.error("Destroy All Processes error", e);
}
}
logger.info("close " + set.size() + " executing process tasks");
}
} }
}
/**
* process manage container
*
*/
public static class ProcessContainer extends ConcurrentHashMap<Integer, Process>{
private static final ProcessContainer container = new ProcessContainer();
private ProcessContainer(){
super();
}
public static final ProcessContainer getInstance(){
return container;
}
public static void putProcess(Process process){
getInstance().put(process.hashCode(), process);
}
public static int processSize(){
return getInstance().size();
}
public static void removeProcess(Process process){
getInstance().remove(process.hashCode());
}
public static void destroyAllProcess(){
Set<Entry<Integer, Process>> set = getInstance().entrySet();
for (Entry<Integer, Process> entry : set) {
try{
entry.getValue().destroy();
} catch (Exception e) {
logger.error("Destroy All Processes error", e);
}
}
logger.info("close " + set.size() + " executing process tasks");
}
}
} }

9
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/shell/ShellExecutor.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.shell; package org.apache.dolphinscheduler.common.shell;
import java.io.BufferedReader; import java.io.BufferedReader;
@ -34,7 +35,6 @@ public class ShellExecutor extends AbstractShell {
private String[] command; private String[] command;
private StringBuffer output; private StringBuffer output;
public ShellExecutor(String... execString) { public ShellExecutor(String... execString) {
this(execString, null); this(execString, null);
} }
@ -45,7 +45,7 @@ public class ShellExecutor extends AbstractShell {
public ShellExecutor(String[] execString, File dir, public ShellExecutor(String[] execString, File dir,
Map<String, String> env) { Map<String, String> env) {
this(execString, dir, env , 0L); this(execString, dir, env,0L);
} }
/** /**
@ -74,7 +74,6 @@ public class ShellExecutor extends AbstractShell {
timeOutInterval = timeout; timeOutInterval = timeout;
} }
/** /**
* Static method to execute a shell command. * Static method to execute a shell command.
* Covers most of the simple cases without requiring the user to implement * Covers most of the simple cases without requiring the user to implement
@ -114,7 +113,7 @@ public class ShellExecutor extends AbstractShell {
* @return the output of the executed command. * @return the output of the executed command.
* @throws IOException errors * @throws IOException errors
*/ */
public static String execCommand(Map<String,String> env, String ... cmd) public static String execCommand(Map<String,String> env, String... cmd)
throws IOException { throws IOException {
return execCommand(env, cmd, 0L); return execCommand(env, cmd, 0L);
} }
@ -138,7 +137,7 @@ public class ShellExecutor extends AbstractShell {
char[] buf = new char[1024]; char[] buf = new char[1024];
int nRead; int nRead;
String line = ""; String line = "";
while ( (nRead = lines.read(buf, 0, buf.length)) > 0 ) { while ((nRead = lines.read(buf, 0, buf.length)) > 0) {
line = new String(buf,0,nRead); line = new String(buf,0,nRead);
output.append(line); output.append(line);
} }

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/AbstractParameters.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task; package org.apache.dolphinscheduler.common.task;
import org.apache.dolphinscheduler.common.enums.Direct; import org.apache.dolphinscheduler.common.enums.Direct;

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/IParameters.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task; package org.apache.dolphinscheduler.common.task;
import org.apache.dolphinscheduler.common.process.ResourceInfo; import org.apache.dolphinscheduler.common.process.ResourceInfo;

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/TaskTimeoutParameter.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task; package org.apache.dolphinscheduler.common.task;
import org.apache.dolphinscheduler.common.enums.TaskTimeoutStrategy; import org.apache.dolphinscheduler.common.enums.TaskTimeoutStrategy;

3
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/dependent/DependentParameters.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task.dependent; package org.apache.dolphinscheduler.common.task.dependent;
import org.apache.dolphinscheduler.common.enums.DependentRelation; import org.apache.dolphinscheduler.common.enums.DependentRelation;
@ -29,8 +30,6 @@ public class DependentParameters extends AbstractParameters {
private List<DependentTaskModel> dependTaskList; private List<DependentTaskModel> dependTaskList;
private DependentRelation relation; private DependentRelation relation;
@Override @Override
public boolean checkParameters() { public boolean checkParameters() {
return true; return true;

4
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/http/HttpParameters.java

@ -62,13 +62,13 @@ public class HttpParameters extends AbstractParameters {
* Connect Timeout * Connect Timeout
* Unit: ms * Unit: ms
*/ */
private int connectTimeout ; private int connectTimeout;
/** /**
* Socket Timeout * Socket Timeout
* Unit: ms * Unit: ms
*/ */
private int socketTimeout ; private int socketTimeout;
@Override @Override
public boolean checkParameters() { public boolean checkParameters() {

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/mr/MapReduceParameters.java

@ -70,7 +70,6 @@ public class MapReduceParameters extends AbstractParameters {
*/ */
private ProgramType programType; private ProgramType programType;
public String getMainClass() { public String getMainClass() {
return mainClass; return mainClass;
} }

72
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/python/PythonParameters.java

@ -14,8 +14,8 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task.python;
package org.apache.dolphinscheduler.common.task.python;
import org.apache.dolphinscheduler.common.process.ResourceInfo; import org.apache.dolphinscheduler.common.process.ResourceInfo;
import org.apache.dolphinscheduler.common.task.AbstractParameters; import org.apache.dolphinscheduler.common.task.AbstractParameters;
@ -23,39 +23,39 @@ import org.apache.dolphinscheduler.common.task.AbstractParameters;
import java.util.List; import java.util.List;
public class PythonParameters extends AbstractParameters { public class PythonParameters extends AbstractParameters {
/** /**
* origin python script * origin python script
*/ */
private String rawScript; private String rawScript;
/** /**
* resource list * resource list
*/ */
private List<ResourceInfo> resourceList; private List<ResourceInfo> resourceList;
public String getRawScript() { public String getRawScript() {
return rawScript; return rawScript;
} }
public void setRawScript(String rawScript) { public void setRawScript(String rawScript) {
this.rawScript = rawScript; this.rawScript = rawScript;
} }
public List<ResourceInfo> getResourceList() { public List<ResourceInfo> getResourceList() {
return resourceList; return resourceList;
} }
public void setResourceList(List<ResourceInfo> resourceList) { public void setResourceList(List<ResourceInfo> resourceList) {
this.resourceList = resourceList; this.resourceList = resourceList;
} }
@Override @Override
public boolean checkParameters() { public boolean checkParameters() {
return rawScript != null && !rawScript.isEmpty(); return rawScript != null && !rawScript.isEmpty();
} }
@Override @Override
public List<ResourceInfo> getResourceFilesList() { public List<ResourceInfo> getResourceFilesList() {
return this.resourceList; return this.resourceList;
} }
} }

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlBinds.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task.sql; package org.apache.dolphinscheduler.common.task.sql;
import org.apache.dolphinscheduler.common.process.Property; import org.apache.dolphinscheduler.common.process.Property;

2
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlType.java

@ -14,8 +14,8 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task.sql;
package org.apache.dolphinscheduler.common.task.sql;
public enum SqlType { public enum SqlType {
/** /**

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/SqoopParameters.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task.sqoop; package org.apache.dolphinscheduler.common.task.sqoop;
import org.apache.dolphinscheduler.common.enums.SqoopJobType; import org.apache.dolphinscheduler.common.enums.SqoopJobType;

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/sources/SourceHdfsParameter.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task.sqoop.sources; package org.apache.dolphinscheduler.common.task.sqoop.sources;
/** /**

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/sources/SourceHiveParameter.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task.sqoop.sources; package org.apache.dolphinscheduler.common.task.sqoop.sources;
/** /**

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/sources/SourceMysqlParameter.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task.sqoop.sources; package org.apache.dolphinscheduler.common.task.sqoop.sources;
import org.apache.dolphinscheduler.common.process.Property; import org.apache.dolphinscheduler.common.process.Property;

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/targets/TargetHdfsParameter.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task.sqoop.targets; package org.apache.dolphinscheduler.common.task.sqoop.targets;
/** /**

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/targets/TargetHiveParameter.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task.sqoop.targets; package org.apache.dolphinscheduler.common.task.sqoop.targets;
/** /**

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/targets/TargetMysqlParameter.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task.sqoop.targets; package org.apache.dolphinscheduler.common.task.sqoop.targets;
/** /**

2
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/subprocess/SubProcessParameters.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task.subprocess; package org.apache.dolphinscheduler.common.task.subprocess;
import org.apache.dolphinscheduler.common.process.ResourceInfo; import org.apache.dolphinscheduler.common.process.ResourceInfo;
@ -22,7 +23,6 @@ import org.apache.dolphinscheduler.common.task.AbstractParameters;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
public class SubProcessParameters extends AbstractParameters { public class SubProcessParameters extends AbstractParameters {
/** /**

21
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/Stopper.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.thread; package org.apache.dolphinscheduler.common.thread;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
@ -23,17 +24,17 @@ import java.util.concurrent.atomic.AtomicBoolean;
*/ */
public class Stopper { public class Stopper {
private static AtomicBoolean signal = new AtomicBoolean(false); private static AtomicBoolean signal = new AtomicBoolean(false);
public static final boolean isStopped(){ public static final boolean isStopped() {
return signal.get(); return signal.get();
} }
public static final boolean isRunning(){ public static final boolean isRunning() {
return !signal.get(); return !signal.get();
} }
public static final void stop(){ public static final void stop() {
signal.set(true); signal.set(true);
} }
} }

3
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadUtils.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.thread; package org.apache.dolphinscheduler.common.thread;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
@ -32,7 +33,7 @@ public class ThreadUtils {
* @param threadsNum threadsNum * @param threadsNum threadsNum
* @return ExecutorService * @return ExecutorService
*/ */
public static ExecutorService newDaemonFixedThreadExecutor(String threadName,int threadsNum){ public static ExecutorService newDaemonFixedThreadExecutor(String threadName,int threadsNum) {
ThreadFactory threadFactory = new ThreadFactoryBuilder() ThreadFactory threadFactory = new ThreadFactoryBuilder()
.setDaemon(true) .setDaemon(true)
.setNameFormat(threadName) .setNameFormat(threadName)

2
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DependentUtils.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.utils; package org.apache.dolphinscheduler.common.utils;
import org.apache.dolphinscheduler.common.enums.DependResult; import org.apache.dolphinscheduler.common.enums.DependResult;
@ -60,7 +61,6 @@ public class DependentUtils {
return dependResult; return dependResult;
} }
/** /**
* get date interval list by business date and date value. * get date interval list by business date and date value.
* *

2
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java

@ -22,8 +22,8 @@ import static org.apache.dolphinscheduler.common.Constants.RESOURCE_UPLOAD_PATH;
import org.apache.dolphinscheduler.common.Constants; import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.ExecutionStatus; import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
import org.apache.dolphinscheduler.common.enums.ResUploadType; import org.apache.dolphinscheduler.common.enums.ResUploadType;
import org.apache.dolphinscheduler.spi.enums.ResourceType;
import org.apache.dolphinscheduler.common.exception.BaseException; import org.apache.dolphinscheduler.common.exception.BaseException;
import org.apache.dolphinscheduler.spi.enums.ResourceType;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java

@ -35,7 +35,6 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Optional;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.util.regex.Pattern; import java.util.regex.Pattern;

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ScriptRunner.java

@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.utils; package org.apache.dolphinscheduler.common.utils;
import java.io.IOException; import java.io.IOException;

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/TriFunction.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.utils; package org.apache.dolphinscheduler.common.utils;
/** /**

Loading…
Cancel
Save