diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/MapHandler.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/MapHandler.java index 6e0732e8a..d26fefef3 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/MapHandler.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/MapHandler.java @@ -15,7 +15,7 @@ public interface MapHandler { * 执行MAP操作 * * @param taskList 需要分片的集合(建议不超过200个, 超过500禁止分片.) - * @param nextTaskName 下一次需要处理MAP的节点名称 (不能是MAP_ROOT) + * @param nextTaskName 下一次需要处理MAP的节点名称 (不能是ROOT_MAP) * @return ExecuteResult */ ExecuteResult doMap(List taskList, String nextTaskName); diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/annotation/MapExecutor.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/annotation/MapExecutor.java index 544eb3aaa..015f7bad4 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/annotation/MapExecutor.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/annotation/MapExecutor.java @@ -25,6 +25,6 @@ public @interface MapExecutor { * * @return */ - String taskName() default SystemConstants.MAP_ROOT; + String taskName() default SystemConstants.ROOT_MAP; } diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/MapInvokeHandler.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/MapInvokeHandler.java index e6644d284..1db0c6c12 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/MapInvokeHandler.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/MapInvokeHandler.java @@ -60,8 +60,8 @@ public final class MapInvokeHandler implements InvocationHandler { } // taskName 任务命名和根任务名或者最终任务名称一致导致的问题(无限生成子任务或者直接失败) - if (SystemConstants.MAP_ROOT.equals(nextTaskName)) { - throw new SnailJobMapReduceException("The Next taskName can not be {}", SystemConstants.MAP_ROOT); + if (SystemConstants.ROOT_MAP.equals(nextTaskName)) { + throw new SnailJobMapReduceException("The Next taskName can not be {}", SystemConstants.ROOT_MAP); } // 使用ThreadLocal传递数据 diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/constant/SystemConstants.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/constant/SystemConstants.java index e92c3a462..d0b6794df 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/constant/SystemConstants.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/constant/SystemConstants.java @@ -212,5 +212,5 @@ public interface SystemConstants { /** * 动态分片的root节点 */ - String MAP_ROOT = "MAP_ROOT"; + String ROOT_MAP = "ROOT_MAP"; } diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobExecutorActor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobExecutorActor.java index cac5f2c24..3aa424f23 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobExecutorActor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobExecutorActor.java @@ -139,7 +139,7 @@ public class JobExecutorActor extends AbstractActor { JobTaskGenerateContext instanceGenerateContext = JobTaskConverter.INSTANCE.toJobTaskInstanceGenerateContext(job); instanceGenerateContext.setTaskBatchId(taskExecute.getTaskBatchId()); 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.setMrStage(MapReduceStageEnum.MAP.getStage()); }