From 37cf53e0a9efbf26c7886eea24a1d897145557f5 Mon Sep 17 00:00:00 2001 From: tjq Date: Sun, 10 Jan 2021 17:56:11 +0800 Subject: [PATCH] fix: Grammatical errors --- .../kfcfans/powerjob/common/TimeExpressionType.java | 8 +++----- .../kfcfans/powerjob/server/service/ValidateService.java | 4 ++-- .../worker/core/tracker/task/FrequentTaskTracker.java | 6 +++--- .../powerjob/worker/core/tracker/task/TaskTracker.java | 4 ++-- .../github/kfcfans/powerjob/FrequentTaskTrackerTest.java | 4 ++-- .../test/java/com/github/kfcfans/powerjob/TestUtils.java | 4 ++-- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/TimeExpressionType.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/TimeExpressionType.java index 0d1f2378..cbfbc990 100644 --- a/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/TimeExpressionType.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/TimeExpressionType.java @@ -18,15 +18,13 @@ public enum TimeExpressionType { API(1), CRON(2), - // FIXED_RATE - FIX_RATE(3), - // FIXED_DELAY - FIX_DELAY(4), + FIXED_RATE(3), + FIXED_DELAY(4), WORKFLOW(5); int v; - public static final List frequentTypes = Lists.newArrayList(FIX_RATE.v, FIX_DELAY.v); + public static final List frequentTypes = Lists.newArrayList(FIXED_RATE.v, FIXED_DELAY.v); public static TimeExpressionType of(int v) { for (TimeExpressionType type : values()) { diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ValidateService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ValidateService.java index 742ecfee..aa8cb7eb 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ValidateService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ValidateService.java @@ -33,8 +33,8 @@ public class ValidateService { case API: return Lists.newArrayList(OmsConstant.NONE); case WORKFLOW: return Lists.newArrayList("VALID: depends on workflow"); case CRON: return calculateCronExpression(timeExpression); - case FIX_RATE: return calculateFixRate(timeExpression); - case FIX_DELAY: return Lists.newArrayList("VALID: depends on execution cost time"); + case FIXED_RATE: return calculateFixRate(timeExpression); + case FIXED_DELAY: return Lists.newArrayList("VALID: depends on execution cost time"); } // impossible return Collections.emptyList(); diff --git a/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/task/FrequentTaskTracker.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/task/FrequentTaskTracker.java index 9fa9b34b..a50029b3 100644 --- a/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/task/FrequentTaskTracker.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/task/FrequentTaskTracker.java @@ -88,7 +88,7 @@ public class FrequentTaskTracker extends TaskTracker { // 2. 启动任务发射器 launcher = new Launcher(); - if (timeExpressionType == TimeExpressionType.FIX_RATE) { + if (timeExpressionType == TimeExpressionType.FIXED_RATE) { // 固定频率需要设置最小间隔 if (timeParams < MIN_INTERVAL) { throw new PowerJobException("time interval too small, please set the timeExpressionInfo >= 1000"); @@ -172,7 +172,7 @@ public class FrequentTaskTracker extends TaskTracker { // 判断是否超出最大执行实例数 if (maxInstanceNum > 0) { - if (timeExpressionType == TimeExpressionType.FIX_RATE) { + if (timeExpressionType == TimeExpressionType.FIXED_RATE) { if (subInstanceId2TimeHolder.size() > maxInstanceNum) { log.warn("[FQTaskTracker-{}] cancel to launch the subInstance({}) due to too much subInstance is running.", instanceId, subInstanceId); processFinishedSubInstance(subInstanceId, false, "TOO_MUCH_INSTANCE"); @@ -368,7 +368,7 @@ public class FrequentTaskTracker extends TaskTracker { taskPersistenceService.deleteAllSubInstanceTasks(instanceId, subInstanceId); // FIX_DELAY 则调度下次任务 - if (timeExpressionType == TimeExpressionType.FIX_DELAY) { + if (timeExpressionType == TimeExpressionType.FIXED_DELAY) { scheduledPool.schedule(launcher, timeParams, TimeUnit.MILLISECONDS); } } diff --git a/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/task/TaskTracker.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/task/TaskTracker.java index 463c7aee..4efc5430 100644 --- a/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/task/TaskTracker.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/task/TaskTracker.java @@ -115,8 +115,8 @@ public abstract class TaskTracker { try { TimeExpressionType timeExpressionType = TimeExpressionType.valueOf(req.getTimeExpressionType()); switch (timeExpressionType) { - case FIX_RATE: - case FIX_DELAY:return new FrequentTaskTracker(req); + case FIXED_RATE: + case FIXED_DELAY:return new FrequentTaskTracker(req); default:return new CommonTaskTracker(req); } } catch (Exception e) { diff --git a/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/FrequentTaskTrackerTest.java b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/FrequentTaskTrackerTest.java index 048218e8..2e377764 100644 --- a/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/FrequentTaskTrackerTest.java +++ b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/FrequentTaskTrackerTest.java @@ -41,13 +41,13 @@ public class FrequentTaskTrackerTest { @Test public void testFixRateJob() throws Exception { - remoteTaskTracker.tell(TestUtils.genServerScheduleJobReq(ExecuteType.STANDALONE, TimeExpressionType.FIX_RATE), null); + remoteTaskTracker.tell(TestUtils.genServerScheduleJobReq(ExecuteType.STANDALONE, TimeExpressionType.FIXED_RATE), null); Thread.sleep(5000000); } @Test public void testFixDelayJob() throws Exception { - remoteTaskTracker.tell(TestUtils.genServerScheduleJobReq(ExecuteType.MAP_REDUCE, TimeExpressionType.FIX_DELAY), null); + remoteTaskTracker.tell(TestUtils.genServerScheduleJobReq(ExecuteType.MAP_REDUCE, TimeExpressionType.FIXED_DELAY), null); Thread.sleep(5000000); } } diff --git a/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/TestUtils.java b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/TestUtils.java index c55ce57f..36bbf2c7 100644 --- a/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/TestUtils.java +++ b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/TestUtils.java @@ -32,8 +32,8 @@ public class TestUtils { req.setTimeExpressionType(timeExpressionType.name()); switch (timeExpressionType) { case CRON:req.setTimeExpression("0 * * * * ? "); - case FIX_RATE: - case FIX_DELAY:req.setTimeExpression("5000"); + case FIXED_RATE: + case FIXED_DELAY:req.setTimeExpression("5000"); } switch (executeType) {