You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2017/07/17 01:54:42 UTC
kylin git commit: KYLIN-2711 avoid NPE if output is lost
Repository: kylin
Updated Branches:
refs/heads/master 0e675cf2c -> dcd12b0ea
KYLIN-2711 avoid NPE if output is lost
Signed-off-by: Li Yang <li...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/dcd12b0e
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/dcd12b0e
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/dcd12b0e
Branch: refs/heads/master
Commit: dcd12b0ea561987f30f348b33c2746b605fc5c71
Parents: 0e675cf
Author: Alexander Sterligov <st...@joom.it>
Authored: Wed Jul 5 13:42:49 2017 +0300
Committer: Li Yang <li...@apache.org>
Committed: Mon Jul 17 09:51:42 2017 +0800
----------------------------------------------------------------------
.../apache/kylin/rest/service/JobService.java | 4 +++
.../kylin/rest/service/JobServiceTest.java | 33 ++++++++++++++++++++
2 files changed, 37 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/dcd12b0e/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java b/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java
index 6451d66..5bf684a 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java
@@ -462,6 +462,10 @@ public class JobService extends BasicService implements InitializingBean {
public boolean apply(CubingJob executable) {
try {
Output output = allOutputs.get(executable.getId());
+ if (output == null){
+ return false;
+ }
+
ExecutableState state = output.getState();
boolean ret = statusList.contains(state);
return ret;
http://git-wip-us.apache.org/repos/asf/kylin/blob/dcd12b0e/server/src/test/java/org/apache/kylin/rest/service/JobServiceTest.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/kylin/rest/service/JobServiceTest.java b/server/src/test/java/org/apache/kylin/rest/service/JobServiceTest.java
index 0932748..fce6027 100644
--- a/server/src/test/java/org/apache/kylin/rest/service/JobServiceTest.java
+++ b/server/src/test/java/org/apache/kylin/rest/service/JobServiceTest.java
@@ -19,9 +19,14 @@
package org.apache.kylin.rest.service;
import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import org.apache.kylin.engine.mr.CubingJob;
import org.apache.kylin.job.constant.JobTimeFilterEnum;
+import org.apache.kylin.job.exception.ExecuteException;
import org.apache.kylin.job.exception.JobException;
+import org.apache.kylin.job.execution.*;
import org.apache.kylin.metadata.project.ProjectInstance;
import org.junit.Assert;
import org.junit.Test;
@@ -50,4 +55,32 @@ public class JobServiceTest extends ServiceTestBase {
Assert.assertNull(jobService.getJobInstance("job_not_exist"));
Assert.assertNotNull(jobService.searchJobs(null, null, null, 0, 0, JobTimeFilterEnum.ALL));
}
+
+ @Test
+ public void testExceptionOnLostJobOutput() {
+ ExecutableManager manager = ExecutableManager.getInstance(jobService.getConfig());
+ AbstractExecutable executable = new TestJob();
+ manager.addJob(executable);
+ List<CubingJob> jobs = jobService.innerSearchCubingJobs("cube",
+ "jobName",
+ Collections.<ExecutableState>emptySet(),
+ 0,
+ Long.MAX_VALUE,
+ Collections.<String, Output>emptyMap(),
+ true,
+ "project");
+ Assert.assertEquals(0, jobs.size());
+ }
+
+ public static class TestJob extends CubingJob {
+
+ public TestJob(){
+ super();
+ }
+
+ @Override
+ protected ExecuteResult doWork(ExecutableContext context) throws ExecuteException {
+ return new ExecuteResult(ExecuteResult.State.SUCCEED, "");
+ }
+ }
}