This is an automated email from the ASF dual-hosted git repository. leonbao pushed a commit to branch json_split in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit cf63fc1fee2406c7e13610bad41eab8b86ab87a6 Merge: 00dcc3f 6bf5031 Author: lenboo <[email protected]> AuthorDate: Tue Mar 16 15:50:06 2021 +0800 Merge remote-tracking branch 'upstream/dev' into spilit .../apache/dolphinscheduler/api/enums/Status.java | 20 +-- .../api/service/impl/DataSourceServiceImpl.java | 109 +++++++++++----- .../api/service/DataSourceServiceTest.java | 21 +-- .../dolphinscheduler/common/enums/DbType.java | 2 +- .../dao/datasource/MySQLDataSource.java | 145 ++++++++++++--------- .../dao/datasource/MySQLDataSourceTest.java | 47 +++---- .../server/worker/task/sqoop/SqoopTaskTest.java | 13 +- pom.xml | 1 + 8 files changed, 225 insertions(+), 133 deletions(-) diff --cc dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java index 510b425,1ec9744..b1ce6cc --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java @@@ -251,13 -256,9 +256,13 @@@ public enum Status BATCH_DELETE_PROCESS_DEFINE_BY_IDS_ERROR(50026, "batch delete process definition by ids {0} error", "批量删除工作流定义[{0}]错误"), TENANT_NOT_SUITABLE(50027, "there is not any tenant suitable, please choose a tenant available.", "没有合适的租户，请选择可用的租户"), EXPORT_PROCESS_DEFINE_BY_ID_ERROR(50028, "export process definition by id error", "导出工作流定义错误"), - BATCH_EXPORT_PROCESS_DEFINE_BY_IDS_ERROR(50028,"batch export process definition by ids error", "批量导出工作流定义错误"), + BATCH_EXPORT_PROCESS_DEFINE_BY_IDS_ERROR(50028, "batch export process definition by ids error", "批量导出工作流定义错误"), IMPORT_PROCESS_DEFINE_ERROR(50029, "import process definition error", "导入工作流定义错误"), - + TASK_DEFINE_NOT_EXIST(50030, "task definition {0} does not exist", "任务定义[{0}]不存在"), + DELETE_TASK_DEFINE_BY_CODE_ERROR(50031, "delete task definition by code error", "删除任务定义错误"), + DELETE_PROCESS_TASK_RELATION_ERROR(50032, "delete process task relation error", "删除工作流任务关系错误"), + PROCESS_TASK_RELATION_NOT_EXIST(50033, "process task relation {0} does not exist", "工作流任务关系[{0}]不存在"), + PROCESS_TASK_RELATION_EXIST(50034, "process task relation is already exist, processCode:[{0}]", "工作流任务关系已存在, processCode:[{0}]"), HDFS_NOT_STARTUP(60001, "hdfs not startup", "hdfs未启用"), /**
