This is an automated email from the ASF dual-hosted git repository.
technoboy pushed a commit to branch dag
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git
The following commit(s) were added to refs/heads/dag by this push:
new 0398992 Rename method name and remove Chinese comments (#1423)
0398992 is described below
commit 0398992277bd76390d5e13eb99ee42f046ff9546
Author: Tboy <[email protected]>
AuthorDate: Thu Aug 27 20:50:47 2020 +0800
Rename method name and remove Chinese comments (#1423)
---
.../elasticjob/cloud/facade/CloudJobFacade.java | 4 ++--
.../cloud/executor/facade/CloudJobFacadeTest.java | 8 ++++----
.../elasticjob/executor/ElasticJobExecutor.java | 24 +++++++++++-----------
.../elasticjob/executor/JobFacade.java | 6 +++---
.../elasticjob/lite/internal/dag/DagService.java | 7 +++----
.../lite/internal/schedule/LiteJobFacade.java | 4 ++--
.../lite/internal/schedule/LiteJobFacadeTest.java | 8 ++++----
7 files changed, 30 insertions(+), 31 deletions(-)
diff --git
a/elasticjob-cloud/elasticjob-cloud-executor/src/main/java/org/apache/shardingsphere/elasticjob/cloud/facade/CloudJobFacade.java
b/elasticjob-cloud/elasticjob-cloud-executor/src/main/java/org/apache/shardingsphere/elasticjob/cloud/facade/CloudJobFacade.java
index 21ca2cf..f2c83e7 100755
---
a/elasticjob-cloud/elasticjob-cloud-executor/src/main/java/org/apache/shardingsphere/elasticjob/cloud/facade/CloudJobFacade.java
+++
b/elasticjob-cloud/elasticjob-cloud-executor/src/main/java/org/apache/shardingsphere/elasticjob/cloud/facade/CloudJobFacade.java
@@ -125,12 +125,12 @@ public final class CloudJobFacade implements JobFacade {
}
@Override
- public void dagStatesCheck() {
+ public void checkDagStates() {
}
@Override
- public void dagJobDependenciesCheck() {
+ public void checkDagJobDependencies() {
}
}
diff --git
a/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/facade/CloudJobFacadeTest.java
b/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/facade/CloudJobFacadeTest.java
index e23d8db..23f424f 100755
---
a/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/facade/CloudJobFacadeTest.java
+++
b/elasticjob-cloud/elasticjob-cloud-executor/src/test/java/org/apache/shardingsphere/elasticjob/cloud/executor/facade/CloudJobFacadeTest.java
@@ -140,12 +140,12 @@ public final class CloudJobFacadeTest {
}
@Test
- public void assertDagStatesCheck() {
- jobFacade.dagStatesCheck();
+ public void assertCheckDagStates() {
+ jobFacade.checkDagStates();
}
@Test
- public void assertDagJobDependenciesCheck() {
- jobFacade.dagJobDependenciesCheck();
+ public void assertCheckDagJobDependencies() {
+ jobFacade.checkDagJobDependencies();
}
}
diff --git
a/elasticjob-executor/elasticjob-executor-kernel/src/main/java/org/apache/shardingsphere/elasticjob/executor/ElasticJobExecutor.java
b/elasticjob-executor/elasticjob-executor-kernel/src/main/java/org/apache/shardingsphere/elasticjob/executor/ElasticJobExecutor.java
index 14a4d28..0652cde 100644
---
a/elasticjob-executor/elasticjob-executor-kernel/src/main/java/org/apache/shardingsphere/elasticjob/executor/ElasticJobExecutor.java
+++
b/elasticjob-executor/elasticjob-executor-kernel/src/main/java/org/apache/shardingsphere/elasticjob/executor/ElasticJobExecutor.java
@@ -83,14 +83,14 @@ public final class ElasticJobExecutor {
public void execute() {
try {
jobFacade.checkJobExecutionEnvironment();
- } catch (final JobExecutionEnvironmentException cause) {
- jobErrorHandler.handleException(jobConfig.getJobName(), cause);
+ } catch (final JobExecutionEnvironmentException ex) {
+ jobErrorHandler.handleException(jobConfig.getJobName(), ex);
}
if (jobFacade.isDagJob()) {
try {
- jobFacade.dagStatesCheck();
- jobFacade.dagJobDependenciesCheck();
+ jobFacade.checkDagStates();
+ jobFacade.checkDagJobDependencies();
//CHECKSTYLE:OFF
} catch (final Exception ex) {
//CHECKSTYLE:ON
@@ -110,9 +110,9 @@ public final class ElasticJobExecutor {
try {
jobFacade.beforeJobExecuted(shardingContexts);
//CHECKSTYLE:OFF
- } catch (final Throwable cause) {
+ } catch (final Throwable ex) {
//CHECKSTYLE:ON
- jobErrorHandler.handleException(jobConfig.getJobName(), cause);
+ jobErrorHandler.handleException(jobConfig.getJobName(), ex);
}
execute(shardingContexts, ExecutionSource.NORMAL_TRIGGER);
while
(jobFacade.isExecuteMisfired(shardingContexts.getShardingItemParameters().keySet()))
{
@@ -123,9 +123,9 @@ public final class ElasticJobExecutor {
try {
jobFacade.afterJobExecuted(shardingContexts);
//CHECKSTYLE:OFF
- } catch (final Throwable cause) {
+ } catch (final Throwable ex) {
//CHECKSTYLE:ON
- jobErrorHandler.handleException(jobConfig.getJobName(), cause);
+ jobErrorHandler.handleException(jobConfig.getJobName(), ex);
}
}
@@ -189,12 +189,12 @@ public final class ElasticJobExecutor {
log.trace("Job '{}' executed, item is: '{}'.",
jobConfig.getJobName(), item);
jobFacade.postJobExecutionEvent(completeEvent);
// CHECKSTYLE:OFF
- } catch (final Throwable cause) {
+ } catch (final Throwable ex) {
// CHECKSTYLE:ON
- completeEvent =
startEvent.executionFailure(ExceptionUtils.transform(cause));
+ completeEvent =
startEvent.executionFailure(ExceptionUtils.transform(ex));
jobFacade.postJobExecutionEvent(completeEvent);
- itemErrorMessages.put(item, ExceptionUtils.transform(cause));
- jobErrorHandler.handleException(jobConfig.getJobName(), cause);
+ itemErrorMessages.put(item, ExceptionUtils.transform(ex));
+ jobErrorHandler.handleException(jobConfig.getJobName(), ex);
}
}
diff --git
a/elasticjob-executor/elasticjob-executor-kernel/src/main/java/org/apache/shardingsphere/elasticjob/executor/JobFacade.java
b/elasticjob-executor/elasticjob-executor-kernel/src/main/java/org/apache/shardingsphere/elasticjob/executor/JobFacade.java
index d6d7e2a..f463846 100644
---
a/elasticjob-executor/elasticjob-executor-kernel/src/main/java/org/apache/shardingsphere/elasticjob/executor/JobFacade.java
+++
b/elasticjob-executor/elasticjob-executor-kernel/src/main/java/org/apache/shardingsphere/elasticjob/executor/JobFacade.java
@@ -150,10 +150,10 @@ public interface JobFacade {
/**
* Check Dag Group States.
*/
- void dagStatesCheck();
+ void checkDagStates();
/**
- * check current job's dependencies are all success.
+ * Check current job's dependencies are all success.
*/
- void dagJobDependenciesCheck();
+ void checkDagJobDependencies();
}
diff --git
a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/dag/DagService.java
b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/dag/DagService.java
index 037f51f..122e6a4 100644
---
a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/dag/DagService.java
+++
b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/dag/DagService.java
@@ -175,7 +175,7 @@ public class DagService implements CuratorCacheListener {
}
/**
- * current dag status.
+ * Get dag status.
*
* @return DagStates
*/
@@ -340,7 +340,6 @@ public class DagService implements CuratorCacheListener {
return;
}
- // 要求dep skip 或 success
String[] deps = dagNodeStorage.getJobDenpendencies();
for (String dep : deps) {
if (StringUtils.equals(dep, "self")) {
@@ -375,9 +374,9 @@ public class DagService implements CuratorCacheListener {
long interval = (jobDagConfig.getRetryInterval() <= 0 ?
DEFAULT_RETRY_INTERVAL : jobDagConfig.getRetryInterval()) * 1000L;
delayQueue.put(dagName + "||" + jobName,
System.currentTimeMillis() + interval);
//CHECKSTYLE:OFF
- } catch (Exception exp) {
+ } catch (Exception ex) {
//CHECKSTYLE:ON
- log.error("Dag-{}[{}] retry job to Delay queue Exception!",
dagName, jobName, exp);
+ log.error("Dag-{}[{}] retry job to Delay queue Exception!",
dagName, jobName, ex);
return false;
}
diff --git
a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/LiteJobFacade.java
b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/LiteJobFacade.java
index af72da4..82d8ede 100644
---
a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/LiteJobFacade.java
+++
b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/LiteJobFacade.java
@@ -206,7 +206,7 @@ public final class LiteJobFacade implements JobFacade {
}
@Override
- public void dagStatesCheck() {
+ public void checkDagStates() {
if (dagService.getDagStates() == DagStates.RUNNING) {
return;
}
@@ -225,7 +225,7 @@ public final class LiteJobFacade implements JobFacade {
}
@Override
- public void dagJobDependenciesCheck() {
+ public void checkDagJobDependencies() {
dagService.checkJobDependenciesState();
}
}
diff --git
a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/LiteJobFacadeTest.java
b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/LiteJobFacadeTest.java
index fc438a3..95c7f5a 100644
---
a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/LiteJobFacadeTest.java
+++
b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/LiteJobFacadeTest.java
@@ -227,14 +227,14 @@ public final class LiteJobFacadeTest {
}
@Test(expected = DagRuntimeException.class)
- public void assertDagStatesCheck() {
+ public void assertCheckDagStates() {
when(dagService.getDagStates()).thenReturn(DagStates.PAUSE);
- liteJobFacade.dagStatesCheck();
+ liteJobFacade.checkDagStates();
}
@Test
- public void assertDagJobDependenciesCheck() {
- liteJobFacade.dagJobDependenciesCheck();
+ public void assertCheckDagJobDependencies() {
+ liteJobFacade.checkDagJobDependencies();
verify(dagService, times(1)).checkJobDependenciesState();
}
}
