You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by le...@apache.org on 2020/06/19 06:38:06 UTC
[incubator-dolphinscheduler] branch dev-merge updated (ee8581b ->
714ae33)
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a change to branch dev-merge
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
from ee8581b change delete status according to delete action result
add 1864f87 remove unnecessary lock & fix syncWorkerHostWeight variable reference bug
add d84512c Merge branch 'dev' into removeUnnecessaryLock
add c8f28ab sqoop task optimization
add 50da695 sqoop front-end optimization
add 5d83d79 modify sqoop task UT
add 822adda add sqoop task UT to pom
add a64c2b3 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add a420644 sqoop task source type or target type is null throw exception
add a7fd0a5 Merge pull request #2943 from Eights-Li/dev-sqoop-optimization
add 87d0379 e2e add queue testcase (#2949)
add 284c50f Compatible with flink1.10 or newer (#2952)
add f56ae9e add http task timeout & test unit (#2955)
add c0ddade Merge branch 'dev' into removeUnnecessaryLock
add a9f72c2 Using Jackson instead of Fastjson
add e386af7 Using Jackson instead of Fastjson
add 39d2713 Using Jackson instead of Fastjson
add 3ccd96a Using Jackson instead of Fastjson
add 48735a8 Using Jackson instead of Fastjson
add f26e246 Using Jackson instead of Fastjson
add dea2d46 Using Jackson instead of Fastjson
add 33bd658 Using Jackson instead of Fastjson
add bb08928 Using Jackson instead of Fastjson
add 8bab8ab ut fix
add 9c36829 ut fix
add 4a10157 ut fix
add 6205e68 annotation reset
add 572ee0f Using Jackson instead of Fastjson
add 4197ee8 Using Jackson instead of Fastjson
add 3286375 Using Jackson instead of Fastjson
add 9ada3c7 Using Jackson instead of Fastjson
add 9a92ab7 Using Jackson instead of Fastjson
add 6e907f1 1. specified jackson Date format. 2. remove getMapper method,replace with toList() 3. rewrite toList method,support constructCollectionType. 4. parseObject(resp, Map.class) replace to toMap() method 5. rename JacksonSerialize to JsonSerializer
add 2c59045 Merge pull request #1 from apache/dev
add 8cabb7a 1. specified jackson Date format. 2. remove getMapper method,replace with toList() 3. rewrite toList method,support constructCollectionType. 4. parseObject(resp, Map.class) replace to toMap() method 5. rename JacksonSerialize to JsonSerializer
add c5b3f35 replace fastjson annotation
add fad0907 remove fastjson maven dependence
add 7d45e11 remove fastjson license
add f643981 1. change windows new line 'CR' to linux new line 'LF' 2. Format code
add 4e37be6 Update SqoopTaskTest.java
add 094d09b Update pom.xml
add b5a296f Update pom.xml
add 71619ed Update pom.xml
add 0b11275 Merge pull request #2 from apache/dev
add 65841a5 1. change windows new line 'CR' to linux new line 'LF' 2. solve conflict
add cfecfb7 1. change windows new line 'CR' to linux new line 'LF' 2. solve conflict
add 24120a4 fix the bad code smell
add 65953fe fix testBuildDataxJobContentJson
add 1b7d8ee fix the bad code smell
add 7f725c3 Update pom.xml
add 6c5b070 Update pom.xml
add eebd0c7 Merge pull request #3 from apache/dev
add 2e4adbe Update pom.xml
add 3fa4dd7 Resolved the conflict
add 3eb3670 Resolved the conflict
add 11c4c58 Merge pull request #2960 from simon824/dev
add f1f9b59 Merge branch 'dev' into removeUnnecessaryLock
add 9fd7289 remove unused import #2715 (#2718)
add 0e7403e [Feature-2927][common] Fix NEF when get info from OSUtils (#2927) (#2964)
add 3a7fd72 first show: remove unnecessary code (#2968)
add a58d1b3 Modify OracleDB connection string format. (#2970)
add f532853 Merge branch 'dev' into removeUnnecessaryLock
add 24c7f76 Merge pull request #2734 from gabrywu/removeUnnecessaryLock
add f7ea4f1 [Feature-2127][sql-schema] Fix the mysql version limited error for 5.5x - 5.64 (#2911)
add 8031c16 add break & default logic for NettyDecoder.decode (#2969)
add 0744d40 [Hotfix-2922][common] Fix Jackson UDde error (#2922) (#2926)
add eef3976 Fix bug #2991 duplicate key: DOLPHIN_ALERT (#2993)
add 714ae33 merge from dev
No new revisions were added by this update.
Summary of changes:
.../common-services/DOLPHIN/1.3.0/alerts.json | 10 +-
dolphinscheduler-alert/pom.xml | 5 -
.../alert/template/impl/DefaultHTMLTemplate.java | 17 +-
.../alert/utils/DingTalkUtils.java | 4 +-
.../alert/utils/EnterpriseWeChatUtils.java | 77 +-
.../dolphinscheduler/alert/utils/ExcelUtils.java | 1 +
.../dolphinscheduler/alert/utils/JSONUtils.java | 69 --
.../template/impl/DefaultHTMLTemplateTest.java | 2 +-
.../alert/utils/DingTalkUtilsTest.java | 5 +-
.../alert/utils/EnterpriseWeChatUtilsTest.java | 11 +-
.../alert/utils/JSONUtilsTest.java | 114 ---
.../alert/utils/MailUtilsTest.java | 1 +
dolphinscheduler-api/pom.xml | 5 -
.../dolphinscheduler/api/dto/ScheduleParam.java | 4 +
.../dolphinscheduler/api/dto/gantt/Task.java | 5 +
.../api/dto/resources/ResourceComponent.java | 14 +-
.../api/dto/treeview/Instance.java | 4 +
.../apache/dolphinscheduler/api/enums/Status.java | 2 +-
.../api/service/BaseDAGService.java | 2 +-
.../api/service/DataSourceService.java | 45 +-
.../api/service/ExecutorService.java | 12 +-
.../api/service/ProcessDefinitionService.java | 11 +-
.../api/service/ProcessInstanceService.java | 25 +-
.../api/service/ResourcesService.java | 9 +-
.../api/service/SchedulerService.java | 2 +-
.../dolphinscheduler/api/utils/CheckUtils.java | 2 +-
.../api/utils/exportprocess/DependentParam.java | 2 +-
.../api/controller/AccessTokenControllerTest.java | 2 +-
.../api/controller/AlertGroupControllerTest.java | 2 +-
.../api/controller/DataAnalysisControllerTest.java | 2 +-
.../api/controller/DataSourceControllerTest.java | 2 +-
.../api/controller/ExecutorControllerTest.java | 2 +-
.../api/controller/LoggerControllerTest.java | 2 +-
.../api/controller/LoginControllerTest.java | 2 +-
.../api/controller/MonitorControllerTest.java | 2 +-
.../controller/ProcessInstanceControllerTest.java | 2 +-
.../api/controller/ProjectControllerTest.java | 2 +-
.../api/controller/QueueControllerTest.java | 2 +-
.../api/controller/ResourcesControllerTest.java | 27 +-
.../api/controller/SchedulerControllerTest.java | 2 +-
.../api/controller/TaskInstanceControllerTest.java | 2 +-
.../api/controller/TaskRecordControllerTest.java | 2 +-
.../api/controller/TenantControllerTest.java | 2 +-
.../api/controller/UsersControllerTest.java | 2 +-
.../api/controller/WorkerGroupControllerTest.java | 2 +-
.../api/service/DataSourceServiceTest.java | 9 +
.../api/service/ProcessDefinitionServiceTest.java | 3 +-
.../api/service/UsersServiceTest.java | 1 -
.../dolphinscheduler/api/utils/CheckUtilsTest.java | 2 +-
.../utils/exportprocess/DataSourceParamTest.java | 2 +-
.../utils/exportprocess/DependentParamTest.java | 3 +-
dolphinscheduler-common/pom.xml | 6 +-
.../{DbConnectType.java => SqoopJobType.java} | 11 +-
.../common/model/DateInterval.java | 6 +-
.../dolphinscheduler/common/model/Server.java | 4 +
.../dolphinscheduler/common/model/TaskNode.java | 7 +-
.../common/task/flink/FlinkParameters.java | 13 +
.../common/task/http/HttpParameters.java | 27 +
.../common/task/sqoop/SqoopParameters.java | 99 ++-
.../task/sqoop/targets/TargetMysqlParameter.java | 2 +-
.../dolphinscheduler/common/utils/HadoopUtils.java | 28 +-
.../dolphinscheduler/common/utils/JSONUtils.java | 67 +-
.../dolphinscheduler/common/utils/OSUtils.java | 15 +-
.../common/utils/ParameterUtils.java | 7 +-
.../dolphinscheduler/common/utils/ResInfo.java | 2 +-
.../common/task/HttpParametersTest.java | 84 ++
.../common/utils/HttpUtilsTest.java | 7 +-
.../common/utils/JSONUtilsTest.java | 118 ++-
.../dolphinscheduler/common/utils/OSUtilsTest.java | 8 +-
.../common/utils/ParameterUtilsTest.java | 11 +-
dolphinscheduler-dao/pom.xml | 6 -
.../dao/datasource/BaseDataSource.java | 2 +-
.../dao/datasource/DataSourceFactory.java | 2 +-
.../dao/datasource/OracleDataSource.java | 13 +
.../dao/entity/CycleDependency.java | 3 +
.../dolphinscheduler/dao/entity/DataSource.java | 3 +
.../dolphinscheduler/dao/entity/ErrorCommand.java | 4 +
.../dolphinscheduler/dao/entity/MonitorRecord.java | 2 +
.../dao/entity/ProcessDefinition.java | 35 +-
.../dao/entity/ProcessInstance.java | 5 +
.../apache/dolphinscheduler/dao/entity/Queue.java | 3 +
.../dolphinscheduler/dao/entity/Resource.java | 3 +
.../dolphinscheduler/dao/entity/ResourcesUser.java | 3 +
.../dolphinscheduler/dao/entity/Schedule.java | 5 +
.../dolphinscheduler/dao/entity/Session.java | 2 +
.../dolphinscheduler/dao/entity/TaskInstance.java | 6 +-
.../dolphinscheduler/dao/entity/TaskRecord.java | 4 +
.../apache/dolphinscheduler/dao/entity/Tenant.java | 3 +
.../dolphinscheduler/dao/entity/UDFUser.java | 3 +
.../dolphinscheduler/dao/entity/UdfFunc.java | 3 +
.../apache/dolphinscheduler/dao/entity/User.java | 3 +
.../dao/entity/UserAlertGroup.java | 3 +
.../dolphinscheduler/dao/entity/WorkerGroup.java | 7 +-
.../dolphinscheduler/dao/entity/WorkerServer.java | 4 +
.../dolphinscheduler/dao/utils/DagHelper.java | 2 +-
.../dao/datasource/OracleDataSourceTest.java | 74 ++
...nstanceTest.java => ProcessDefinitionTest.java} | 21 +-
.../dao/mapper/ProcessDefinitionMapperTest.java | 4 +
.../dolphinscheduler/dao/utils/DagHelperTest.java | 2 +-
dolphinscheduler-dist/release-docs/LICENSE | 5 +-
dolphinscheduler-dist/release-docs/NOTICE | 20 -
dolphinscheduler-remote/pom.xml | 8 +-
.../remote/NettyRemotingServer.java | 4 +-
.../remote/codec/NettyDecoder.java | 10 +
.../remote/command/TaskExecuteAckCommand.java | 134 ++-
.../remote/command/TaskExecuteRequestCommand.java | 68 +-
.../remote/command/TaskExecuteResponseCommand.java | 130 ++-
.../dolphinscheduler/remote/command/TaskInfo.java | 4 +
.../remote/command/TaskKillRequestCommand.java | 62 +-
.../remote/command/TaskKillResponseCommand.java | 120 ++-
.../command/log/GetLogBytesRequestCommand.java | 4 +-
.../command/log/GetLogBytesResponseCommand.java | 4 +-
.../command/log/RollViewLogRequestCommand.java | 4 +-
.../command/log/RollViewLogResponseCommand.java | 4 +-
.../remote/command/log/ViewLogRequestCommand.java | 4 +-
.../remote/command/log/ViewLogResponseCommand.java | 4 +-
...FastJsonSerializer.java => JsonSerializer.java} | 42 +-
...SerializerTest.java => JsonSerializerTest.java} | 8 +-
.../server/entity/TaskExecutionContext.java | 7 +-
.../server/log/LoggerRequestProcessor.java | 10 +-
.../master/consumer/TaskPriorityQueueConsumer.java | 42 +-
.../server/master/processor/TaskAckProcessor.java | 4 +-
.../processor/TaskKillResponseProcessor.java | 4 +-
.../master/processor/TaskResponseProcessor.java | 4 +-
.../master/processor/queue/TaskResponseEvent.java | 3 +
.../master/runner/ConditionsTaskExecThread.java | 2 +-
.../master/runner/DependentTaskExecThread.java | 4 +-
.../master/runner/MasterBaseTaskExecThread.java | 4 +-
.../server/master/runner/MasterExecThread.java | 5 +-
.../server/master/runner/MasterTaskExecThread.java | 6 +-
.../server/utils/AlertManager.java | 6 +-
.../server/utils/FlinkArgsUtils.java | 18 +-
.../worker/processor/TaskExecuteProcessor.java | 14 +-
.../server/worker/processor/TaskKillProcessor.java | 4 +-
.../server/worker/runner/TaskExecuteThread.java | 7 +-
.../server/worker/task/AbstractTask.java | 2 +-
.../server/worker/task/TaskProps.java | 3 +
.../server/worker/task/datax/DataxTask.java | 214 ++---
.../server/worker/task/flink/FlinkTask.java | 2 +-
.../server/worker/task/http/HttpTask.java | 26 +-
.../server/worker/task/mr/MapReduceTask.java | 2 +-
.../worker/task/processdure/ProcedureTask.java | 5 +-
.../server/worker/task/python/PythonTask.java | 2 +-
.../server/worker/task/shell/ShellTask.java | 2 +-
.../server/worker/task/spark/SparkTask.java | 2 +-
.../server/worker/task/sql/SqlTask.java | 22 +-
.../server/worker/task/sqoop/SqoopTask.java | 5 +-
.../task/sqoop/generator/CommonGenerator.java | 39 +
.../task/sqoop/generator/SqoopJobGenerator.java | 22 +-
.../generator/sources/HdfsSourceGenerator.java | 2 +-
.../generator/sources/HiveSourceGenerator.java | 2 +-
.../generator/sources/MysqlSourceGenerator.java | 2 +-
.../generator/targets/HdfsTargetGenerator.java | 2 +-
.../generator/targets/HiveTargetGenerator.java | 2 +-
.../generator/targets/MysqlTargetGenerator.java | 4 +-
.../server/master/MasterExecThreadTest.java | 4 +-
.../dolphinscheduler/server/master/ParamsTest.java | 5 +-
.../server/utils/FlinkArgsUtilsTest.java | 4 +-
.../server/utils/ParamUtilsTest.java | 14 +-
.../worker/shell/ShellCommandExecutorTest.java | 7 +-
.../server/worker/sql/SqlExecutorTest.java | 7 +-
.../server/worker/task/datax/DataxTaskTest.java | 134 +--
.../server/worker/task/http/HttpTaskTest.java | 208 +++++
.../server/worker/task/spark/SparkTaskTest.java | 2 +-
.../server/worker/task/sqoop/SqoopTaskTest.java | 128 +--
.../service/log/LogClientService.java | 8 +-
.../service/process/ProcessService.java | 38 +-
.../service/quartz/QuartzExecutors.java | 4 +-
.../_source/formModel/tasks/_source/datasource.vue | 2 +-
.../pages/dag/_source/formModel/tasks/flink.vue | 67 +-
.../pages/dag/_source/formModel/tasks/http.vue | 58 +-
.../pages/dag/_source/formModel/tasks/sqoop.vue | 928 +++++++++++++--------
.../src/js/module/i18n/locale/en_US.js | 15 +
.../src/js/module/i18n/locale/zh_CN.js | 17 +-
.../dolphinscheduler/common/BrowserCommon.java | 34 +-
...{TenantManageData.java => QueueManageData.java} | 27 +-
.../data/security/TokenManageData.java | 15 +-
.../QueueManageLocator.java} | 22 +-
...tManageLocator.java => TokenManageLocator.java} | 24 +-
.../page/security/AlertManagePage.java | 4 +-
.../page/security/QueueManagePage.java | 85 ++
.../page/security/TokenManagePage.java | 94 +++
.../{TestDeleteUser.java => TestDeleteToken.java} | 24 +-
...{TestTenantManage.java => TestQueueManage.java} | 24 +-
.../{TestUserManage.java => TestTokenManage.java} | 25 +-
e2e/testng.xml | 3 +
pom.xml | 13 +-
.../mysql/dolphinscheduler_ddl.sql | 4 +-
sql/dolphinscheduler_mysql.sql | 4 +-
.../1.0.2_schema/mysql/dolphinscheduler_ddl.sql | 10 +-
tools/dependencies/known-dependencies.txt | 1 -
191 files changed, 3068 insertions(+), 1433 deletions(-)
delete mode 100644 dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/JSONUtils.java
delete mode 100644 dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/JSONUtilsTest.java
copy dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/{DbConnectType.java => SqoopJobType.java} (87%)
create mode 100644 dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/task/HttpParametersTest.java
create mode 100644 dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/datasource/OracleDataSourceTest.java
copy dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/entity/{TaskInstanceTest.java => ProcessDefinitionTest.java} (61%)
rename dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/{FastJsonSerializer.java => JsonSerializer.java} (56%)
rename dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/{FastJsonSerializerTest.java => JsonSerializerTest.java} (84%)
create mode 100644 dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/http/HttpTaskTest.java
copy e2e/src/test/java/org/apache/dolphinscheduler/data/security/{TenantManageData.java => QueueManageData.java} (65%)
copy dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DependResult.java => e2e/src/test/java/org/apache/dolphinscheduler/data/security/TokenManageData.java (78%)
copy e2e/src/test/java/org/apache/dolphinscheduler/locator/{LoginLocator.java => security/QueueManageLocator.java} (57%)
copy e2e/src/test/java/org/apache/dolphinscheduler/locator/security/{TenantManageLocator.java => TokenManageLocator.java} (50%)
create mode 100644 e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
create mode 100644 e2e/src/test/java/org/apache/dolphinscheduler/page/security/TokenManagePage.java
copy e2e/src/test/java/org/apache/dolphinscheduler/testcase/testDeleteData/{TestDeleteUser.java => TestDeleteToken.java} (66%)
copy e2e/src/test/java/org/apache/dolphinscheduler/testcase/testSecurity/{TestTenantManage.java => TestQueueManage.java} (60%)
copy e2e/src/test/java/org/apache/dolphinscheduler/testcase/testSecurity/{TestUserManage.java => TestTokenManage.java} (60%)