From ffdc3d9dc2e5d297427a3426d0f20dd8671d6fda Mon Sep 17 00:00:00 2001 From: wodeyangzipingpingwuqi Date: Fri, 14 Jun 2024 13:43:29 +0800 Subject: [PATCH] =?UTF-8?q?feat(dev=5F1.1.0):=201=E3=80=81=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=89=B9=E6=AC=A1=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8B=E8=BF=94=E5=9B=9E=E5=80=BC?= =?UTF-8?q?=202=E3=80=81Reduce=E9=98=B6=E6=AE=B5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=BB=93=E6=9E=9C=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/job/core/dto/{MrTaskResult.java => MapArgs.java} | 6 +++--- .../aizuda/snailjob/client/job/core/dto/MapReduceArgs.java | 4 ++++ .../client/job/core/executor/AbstractMapExecutor.java | 3 +-- .../client/job/core/executor/AbstractMapReduceExecutor.java | 6 ++++-- .../server/web/model/response/JobBatchResponseVO.java | 5 +++++ 5 files changed, 17 insertions(+), 7 deletions(-) rename snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/{MrTaskResult.java => MapArgs.java} (69%) diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/MrTaskResult.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/MapArgs.java similarity index 69% rename from snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/MrTaskResult.java rename to snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/MapArgs.java index 6bce83b49..74f5c0d4a 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/MrTaskResult.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/MapArgs.java @@ -9,11 +9,11 @@ import lombok.Data; * @date : 2024-06-12 13:59 */ @Data -public class MrTaskResult { +public class MapArgs { - private String taskId; + private String mapName; - private boolean success; + private Boolean success; private String result; } diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/MapReduceArgs.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/MapReduceArgs.java index f29b83cb9..4cead9a2f 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/MapReduceArgs.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/MapReduceArgs.java @@ -3,6 +3,8 @@ package com.aizuda.snailjob.client.job.core.dto; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * @author: opensnail * @date : 2024-06-13 @@ -13,4 +15,6 @@ import lombok.EqualsAndHashCode; public class MapReduceArgs extends JobArgs { private String mapName; + + private List mapArgsList; } diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/AbstractMapExecutor.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/AbstractMapExecutor.java index 2ba2dc634..238fe9f82 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/AbstractMapExecutor.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/AbstractMapExecutor.java @@ -11,7 +11,6 @@ import com.aizuda.snailjob.client.model.request.MapTaskRequest; import com.aizuda.snailjob.common.core.constant.SystemConstants; import com.aizuda.snailjob.common.core.exception.SnailJobMapReduceException; import com.aizuda.snailjob.common.core.model.JobContext; -import com.aizuda.snailjob.common.core.model.MapContext; import com.aizuda.snailjob.common.core.model.NettyResult; import com.aizuda.snailjob.common.core.model.Result; import lombok.extern.slf4j.Slf4j; @@ -35,7 +34,7 @@ public abstract class AbstractMapExecutor extends AbstractJobExecutor implements @Override protected ExecuteResult doJobExecute(final JobArgs jobArgs) { MapReduceArgs mapReduceArgs = (MapReduceArgs) jobArgs; - return doJobExecute(mapReduceArgs); + return this.doJobExecute(mapReduceArgs); } public abstract ExecuteResult doJobExecute(MapReduceArgs mapReduceArgs); diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/AbstractMapReduceExecutor.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/AbstractMapReduceExecutor.java index c80893915..a41b7cb16 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/AbstractMapReduceExecutor.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/AbstractMapReduceExecutor.java @@ -1,9 +1,11 @@ package com.aizuda.snailjob.client.job.core.executor; -import com.aizuda.snailjob.client.job.core.dto.JobArgs; +import com.aizuda.snailjob.client.job.core.dto.MapArgs; import com.aizuda.snailjob.client.model.ExecuteResult; import com.aizuda.snailjob.common.core.model.JobContext; +import java.util.List; + /** * @author zhengweilin * @version 1.0.0 @@ -11,5 +13,5 @@ import com.aizuda.snailjob.common.core.model.JobContext; */ public abstract class AbstractMapReduceExecutor extends AbstractMapExecutor { - protected abstract ExecuteResult doReduceExecute(JobContext jobContext, JobArgs jobArgs); + protected abstract ExecuteResult doReduceExecute(JobContext jobContext, List mapArgsList); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/JobBatchResponseVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/JobBatchResponseVO.java index f701558ba..dbdfbc36f 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/JobBatchResponseVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/JobBatchResponseVO.java @@ -26,6 +26,11 @@ public class JobBatchResponseVO { */ private String jobName; + /** + * 任务类型 + */ + private String taskType; + /** * 工作流节点名称 */