Repository: kylin Updated Branches: refs/heads/master 5ffc5fa0a -> f8d3f1430
KYLIN-1726 undo âtask discard itselfâ changes as it is not needed Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/f8d3f143 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/f8d3f143 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/f8d3f143 Branch: refs/heads/master Commit: f8d3f143079719b43a5758d24368ab518238dccc Parents: 5ffc5fa Author: shaofengshi <shaofeng...@apache.org> Authored: Wed Nov 2 18:27:57 2016 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Wed Nov 2 18:27:57 2016 +0800 ---------------------------------------------------------------------- .../kylin/job/execution/AbstractExecutable.java | 2 - .../job/execution/DefaultChainedExecutable.java | 2 - .../kylin/job/execution/ExecuteResult.java | 4 -- .../kylin/job/DiscardedTestExecutable.java | 41 -------------------- .../impl/threadpool/DefaultSchedulerTest.java | 16 -------- .../kylin/provision/BuildCubeWithStream.java | 6 +-- 6 files changed, 1 insertion(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/f8d3f143/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java ---------------------------------------------------------------------- diff --git a/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java b/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java index b4ca469..90e4d3c 100644 --- a/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java +++ b/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java @@ -74,8 +74,6 @@ public abstract class AbstractExecutable implements Executable, Idempotent { if (!isDiscarded()) { if (result.succeed()) { executableManager.updateJobOutput(getId(), ExecutableState.SUCCEED, null, result.output()); - } else if (result.discarded()) { - executableManager.updateJobOutput(getId(), ExecutableState.DISCARDED, null, result.output()); } else { executableManager.updateJobOutput(getId(), ExecutableState.ERROR, null, result.output()); } http://git-wip-us.apache.org/repos/asf/kylin/blob/f8d3f143/core-job/src/main/java/org/apache/kylin/job/execution/DefaultChainedExecutable.java ---------------------------------------------------------------------- diff --git a/core-job/src/main/java/org/apache/kylin/job/execution/DefaultChainedExecutable.java b/core-job/src/main/java/org/apache/kylin/job/execution/DefaultChainedExecutable.java index 5a57b05..39a5f4f 100644 --- a/core-job/src/main/java/org/apache/kylin/job/execution/DefaultChainedExecutable.java +++ b/core-job/src/main/java/org/apache/kylin/job/execution/DefaultChainedExecutable.java @@ -119,8 +119,6 @@ public class DefaultChainedExecutable extends AbstractExecutable implements Chai } else { jobService.updateJobOutput(getId(), ExecutableState.READY, null, null); } - } else if (result.discarded()) { - jobService.updateJobOutput(getId(), ExecutableState.DISCARDED, null, result.output()); } else { setEndTime(System.currentTimeMillis()); jobService.updateJobOutput(getId(), ExecutableState.ERROR, null, result.output()); http://git-wip-us.apache.org/repos/asf/kylin/blob/f8d3f143/core-job/src/main/java/org/apache/kylin/job/execution/ExecuteResult.java ---------------------------------------------------------------------- diff --git a/core-job/src/main/java/org/apache/kylin/job/execution/ExecuteResult.java b/core-job/src/main/java/org/apache/kylin/job/execution/ExecuteResult.java index 2347e7d..760a574 100644 --- a/core-job/src/main/java/org/apache/kylin/job/execution/ExecuteResult.java +++ b/core-job/src/main/java/org/apache/kylin/job/execution/ExecuteResult.java @@ -49,10 +49,6 @@ public final class ExecuteResult { return state == State.SUCCEED; } - public boolean discarded() { - return state == State.DISCARDED; - } - public String output() { return output; } http://git-wip-us.apache.org/repos/asf/kylin/blob/f8d3f143/core-job/src/test/java/org/apache/kylin/job/DiscardedTestExecutable.java ---------------------------------------------------------------------- diff --git a/core-job/src/test/java/org/apache/kylin/job/DiscardedTestExecutable.java b/core-job/src/test/java/org/apache/kylin/job/DiscardedTestExecutable.java deleted file mode 100644 index 9362e18..0000000 --- a/core-job/src/test/java/org/apache/kylin/job/DiscardedTestExecutable.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. -*/ - -package org.apache.kylin.job; - -import org.apache.kylin.job.exception.ExecuteException; -import org.apache.kylin.job.execution.ExecutableContext; -import org.apache.kylin.job.execution.ExecuteResult; - -/** - */ -public class DiscardedTestExecutable extends BaseTestExecutable { - - public DiscardedTestExecutable() { - super(); - } - - @Override - protected ExecuteResult doWork(ExecutableContext context) throws ExecuteException { - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - } - return new ExecuteResult(ExecuteResult.State.DISCARDED, "discarded"); - } -} http://git-wip-us.apache.org/repos/asf/kylin/blob/f8d3f143/core-job/src/test/java/org/apache/kylin/job/impl/threadpool/DefaultSchedulerTest.java ---------------------------------------------------------------------- diff --git a/core-job/src/test/java/org/apache/kylin/job/impl/threadpool/DefaultSchedulerTest.java b/core-job/src/test/java/org/apache/kylin/job/impl/threadpool/DefaultSchedulerTest.java index 2baf10a..df521f9 100644 --- a/core-job/src/test/java/org/apache/kylin/job/impl/threadpool/DefaultSchedulerTest.java +++ b/core-job/src/test/java/org/apache/kylin/job/impl/threadpool/DefaultSchedulerTest.java @@ -29,7 +29,6 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.apache.kylin.job.DiscardedTestExecutable; import org.apache.kylin.job.BaseTestExecutable; import org.apache.kylin.job.ErrorTestExecutable; import org.apache.kylin.job.FailedTestExecutable; @@ -84,21 +83,6 @@ public class DefaultSchedulerTest extends BaseSchedulerTest { } @Test - public void testSucceedAndDiscarded() throws Exception { - DefaultChainedExecutable job = new DefaultChainedExecutable(); - BaseTestExecutable task1 = new SucceedTestExecutable(); - BaseTestExecutable task2 = new DiscardedTestExecutable(); - job.addTask(task1); - job.addTask(task2); - jobService.addJob(job); - waitForJobFinish(job.getId()); - Assert.assertEquals(ExecutableState.DISCARDED, jobService.getOutput(job.getId()).getState()); - Assert.assertEquals(ExecutableState.SUCCEED, jobService.getOutput(task1.getId()).getState()); - Assert.assertEquals(ExecutableState.DISCARDED, jobService.getOutput(task2.getId()).getState()); - } - - - @Test public void testSucceedAndError() throws Exception { DefaultChainedExecutable job = new DefaultChainedExecutable(); BaseTestExecutable task1 = new ErrorTestExecutable(); http://git-wip-us.apache.org/repos/asf/kylin/blob/f8d3f143/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java b/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java index 000ac16..9fd6c52 100644 --- a/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java +++ b/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java @@ -218,13 +218,9 @@ public class BuildCubeWithStream { Assert.assertTrue(segments.size() == succeedBuild); if (fastBuildMode == false) { - //empty build - ExecutableState result = buildSegment(cubeName, 0, Long.MAX_VALUE); - Assert.assertTrue(result == ExecutableState.DISCARDED); - long endOffset = segments.get(segments.size() - 1).getSourceOffsetEnd(); //merge - result = mergeSegment(cubeName, 0, endOffset); + ExecutableState result = mergeSegment(cubeName, 0, endOffset); Assert.assertTrue(result == ExecutableState.SUCCEED); segments = cubeManager.getCube(cubeName).getSegments();
