gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

feat(sj_1.1.0-beta2): MAP_ROOT改为ROOT_MAP

Browse Source
This commit is contained in:
opensnail 2024-07-07 13:44:20 +08:00
parent b371a092cf
commit 8de35d775d
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/MapHandler.java
View File

@ -15,7 +15,7 @@ public interface MapHandler<T> {
* 执行MAP操作 * 执行MAP操作
* *
* @param taskList 需要分片的集合(建议不超过200个, 超过500禁止分片.) * @param taskList 需要分片的集合(建议不超过200个, 超过500禁止分片.)
* @param nextTaskName 下一次需要处理MAP的节点名称 (不能是MAP_ROOT) * @param nextTaskName 下一次需要处理MAP的节点名称 (不能是ROOT_MAP)
* @return ExecuteResult * @return ExecuteResult
*/ */
ExecuteResult doMap(List<T> taskList, String nextTaskName); ExecuteResult doMap(List<T> taskList, String nextTaskName);

2
snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/annotation/MapExecutor.java
View File

@ -25,6 +25,6 @@ public @interface MapExecutor {
* *
* @return * @return
*/ */
String taskName() default SystemConstants.MAP_ROOT; String taskName() default SystemConstants.ROOT_MAP;
} }

4
snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/MapInvokeHandler.java
View File

@ -60,8 +60,8 @@ public final class MapInvokeHandler implements InvocationHandler {
} }
// taskName 任务命名和根任务名或者最终任务名称一致导致的问题（无限生成子任务或者直接失败） // taskName 任务命名和根任务名或者最终任务名称一致导致的问题（无限生成子任务或者直接失败）
if (SystemConstants.MAP_ROOT.equals(nextTaskName)) { if (SystemConstants.ROOT_MAP.equals(nextTaskName)) {
throw new SnailJobMapReduceException("The Next taskName can not be {}", SystemConstants.MAP_ROOT); throw new SnailJobMapReduceException("The Next taskName can not be {}", SystemConstants.ROOT_MAP);
} }
// 使用ThreadLocal传递数据 // 使用ThreadLocal传递数据

2
snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/constant/SystemConstants.java
View File

@ -212,5 +212,5 @@ public interface SystemConstants {
/** /**
* 动态分片的root节点 * 动态分片的root节点
*/ */
String MAP_ROOT = "MAP_ROOT"; String ROOT_MAP = "ROOT_MAP";
} }

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobExecutorActor.java
View File

@ -139,7 +139,7 @@ public class JobExecutorActor extends AbstractActor {
JobTaskGenerateContext instanceGenerateContext = JobTaskConverter.INSTANCE.toJobTaskInstanceGenerateContext(job); JobTaskGenerateContext instanceGenerateContext = JobTaskConverter.INSTANCE.toJobTaskInstanceGenerateContext(job);
instanceGenerateContext.setTaskBatchId(taskExecute.getTaskBatchId()); instanceGenerateContext.setTaskBatchId(taskExecute.getTaskBatchId());
if (Lists.newArrayList(MAP_REDUCE.getType(), MAP.getType()).contains(job.getTaskType())) { if (Lists.newArrayList(MAP_REDUCE.getType(), MAP.getType()).contains(job.getTaskType())) {
instanceGenerateContext.setTaskName(SystemConstants.MAP_ROOT); instanceGenerateContext.setTaskName(SystemConstants.ROOT_MAP);
instanceGenerateContext.setMapSubTask(Lists.newArrayList(StrUtil.EMPTY)); instanceGenerateContext.setMapSubTask(Lists.newArrayList(StrUtil.EMPTY));
instanceGenerateContext.setMrStage(MapReduceStageEnum.MAP.getStage()); instanceGenerateContext.setMrStage(MapReduceStageEnum.MAP.getStage());
} }