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 6ef54ebe9b34b6f40c555375946f91d1d73c1674 Merge: 461e633 beb5adb Author: lenboo <[email protected]> AuthorDate: Thu Mar 11 17:01:29 2021 +0800 Merge remote-tracking branch 'upstream/dev' into spilit .../plugin/alert/email/MailSender.java | 11 ++ .../dolphinscheduler/api/utils/CheckUtilsTest.java | 23 ++- .../apache/dolphinscheduler/common/Constants.java | 11 +- ...uceParameters.java => MapReduceParameters.java} | 20 ++- .../common/utils/TaskParametersUtils.java | 4 +- .../server/utils/FlinkArgsUtils.java | 6 + .../server/utils/MapReduceArgsUtils.java | 85 +++++++++ .../server/utils/SparkArgsUtils.java | 10 +- .../server/worker/task/flink/FlinkTask.java | 189 ++++++++++----------- .../server/worker/task/mr/MapReduceTask.java | 65 ++----- .../server/worker/task/spark/SparkTask.java | 21 ++- .../server/utils/FlinkArgsUtilsTest.java | 7 +- .../server/utils/MapReduceArgsUtilsTest.java | 95 +++++++++++ .../server/utils/SparkArgsUtilsTest.java | 2 +- .../home/pages/dag/_source/formModel/tasks/mr.vue | 17 ++ pom.xml | 1 + 16 files changed, 379 insertions(+), 188 deletions(-)
