You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ga...@apache.org on 2020/06/13 11:47:45 UTC
[incubator-dolphinscheduler] branch dev updated (f56ae9e -> 11c4c58)
This is an automated email from the ASF dual-hosted git repository.
gabrywu pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
from f56ae9e add http task timeout & test unit (#2955)
new a9f72c2 Using Jackson instead of Fastjson
new e386af7 Using Jackson instead of Fastjson
new 39d2713 Using Jackson instead of Fastjson
new 3ccd96a Using Jackson instead of Fastjson
new 48735a8 Using Jackson instead of Fastjson
new f26e246 Using Jackson instead of Fastjson
new dea2d46 Using Jackson instead of Fastjson
new 33bd658 Using Jackson instead of Fastjson
new bb08928 Using Jackson instead of Fastjson
new 8bab8ab ut fix
new 9c36829 ut fix
new 4a10157 ut fix
new 6205e68 annotation reset
new 572ee0f Using Jackson instead of Fastjson
new 4197ee8 Using Jackson instead of Fastjson
new 3286375 Using Jackson instead of Fastjson
new 9ada3c7 Using Jackson instead of Fastjson
new 9a92ab7 Using Jackson instead of Fastjson
new 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
new 2c59045 Merge pull request #1 from apache/dev
new 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
new c5b3f35 replace fastjson annotation
new fad0907 remove fastjson maven dependence
new 7d45e11 remove fastjson license
new f643981 1. change windows new line 'CR' to linux new line 'LF' 2. Format code
new 4e37be6 Update SqoopTaskTest.java
new 094d09b Update pom.xml
new b5a296f Update pom.xml
new 71619ed Update pom.xml
new 0b11275 Merge pull request #2 from apache/dev
new 65841a5 1. change windows new line 'CR' to linux new line 'LF' 2. solve conflict
new cfecfb7 1. change windows new line 'CR' to linux new line 'LF' 2. solve conflict
new 24120a4 fix the bad code smell
new 65953fe fix testBuildDataxJobContentJson
new 1b7d8ee fix the bad code smell
new 7f725c3 Update pom.xml
new 6c5b070 Update pom.xml
new eebd0c7 Merge pull request #3 from apache/dev
new 2e4adbe Update pom.xml
new 3fa4dd7 Resolved the conflict
new 3eb3670 Resolved the conflict
new 11c4c58 Merge pull request #2960 from simon824/dev
The 2834 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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 | 4 +-
.../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 +
.../api/service/BaseDAGService.java | 2 +-
.../api/service/DataSourceService.java | 43 ++---
.../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/ProcessDefinitionServiceTest.java | 3 +-
.../dolphinscheduler/api/utils/CheckUtilsTest.java | 2 +-
.../utils/exportprocess/DataSourceParamTest.java | 2 +-
.../utils/exportprocess/DependentParamTest.java | 3 +-
dolphinscheduler-common/pom.xml | 6 +-
.../common/model/DateInterval.java | 6 +-
.../dolphinscheduler/common/model/Server.java | 4 +
.../dolphinscheduler/common/model/TaskNode.java | 7 +-
.../dolphinscheduler/common/utils/HadoopUtils.java | 28 +--
.../dolphinscheduler/common/utils/JSONUtils.java | 34 +++-
.../common/utils/ParameterUtils.java | 14 +-
.../dolphinscheduler/common/utils/ResInfo.java | 2 +-
.../common/task/HttpParametersTest.java | 15 +-
.../common/utils/HttpUtilsTest.java | 7 +-
.../common/utils/JSONUtilsTest.java | 99 ++++++----
.../common/utils/ParameterUtilsTest.java | 11 +-
dolphinscheduler-dao/pom.xml | 6 -
.../dao/datasource/DataSourceFactory.java | 2 +-
.../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 | 4 +-
.../dolphinscheduler/dao/entity/WorkerServer.java | 4 +
.../dolphinscheduler/dao/utils/DagHelper.java | 2 +-
...nstanceTest.java => ProcessDefinitionTest.java} | 21 +-
.../dao/mapper/ProcessDefinitionMapperTest.java | 4 +
.../dolphinscheduler/dao/utils/DagHelperTest.java | 2 +-
dolphinscheduler-dist/release-docs/LICENSE | 1 -
dolphinscheduler-dist/release-docs/NOTICE | 20 --
dolphinscheduler-remote/pom.xml | 8 +-
.../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 | 8 +-
.../master/consumer/TaskPriorityQueueConsumer.java | 11 +-
.../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 | 7 +-
.../server/utils/AlertManager.java | 6 +-
.../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 | 213 +++++++++++----------
.../server/worker/task/flink/FlinkTask.java | 2 +-
.../server/worker/task/http/HttpTask.java | 17 +-
.../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 +-
.../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 | 2 +-
.../server/master/MasterExecThreadTest.java | 4 +-
.../dolphinscheduler/server/master/ParamsTest.java | 5 +-
.../server/utils/ParamUtilsTest.java | 14 +-
.../worker/shell/ShellCommandExecutorTest.java | 7 +-
.../server/worker/sql/SqlExecutorTest.java | 7 +-
.../server/worker/task/datax/DataxTaskTest.java | 130 +++++++------
.../server/worker/task/http/HttpTaskTest.java | 4 +-
.../server/worker/task/spark/SparkTaskTest.java | 2 +-
.../server/worker/task/sqoop/SqoopTaskTest.java | 12 +-
.../service/log/LogClientService.java | 8 +-
.../service/process/ProcessService.java | 34 ++--
.../service/quartz/QuartzExecutors.java | 4 +-
pom.xml | 9 +-
tools/dependencies/known-dependencies.txt | 1 -
150 files changed, 1291 insertions(+), 844 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-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%)