[34/50] [abbrv] kylin git commit: KYLIN-227

2016-11-27 Thread liyang 
KYLIN-227


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/798f03ed
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/798f03ed
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/798f03ed

Branch: refs/heads/KYLIN-1875
Commit: 798f03ed2eaaddaee5930ff074a022655fec51ff
Parents: 53b5a6d
Author: shaofengshi 
Authored: Fri Nov 11 16:11:55 2016 +0800
Committer: shaofengshi 
Committed: Thu Nov 24 09:11:33 2016 +0800

--
 .../kylin/job/constant/JobStatusEnum.java   |  2 +-
 .../kylin/job/constant/JobStepStatusEnum.java   |  2 +-
 .../kylin/job/execution/AbstractExecutable.java |  5 +++
 .../job/execution/DefaultChainedExecutable.java |  6 
 .../kylin/job/execution/ExecutableManager.java  | 11 +-
 .../kylin/job/execution/ExecutableState.java|  7 
 .../job/impl/threadpool/DefaultScheduler.java   |  6 ++--
 .../apache/kylin/job/ExecutableManagerTest.java |  2 +-
 .../kylin/rest/controller/JobController.java| 22 
 .../apache/kylin/rest/service/CubeService.java  |  2 +-
 .../apache/kylin/rest/service/JobService.java   | 15 
 webapp/app/js/controllers/job.js| 38 +++-
 webapp/app/js/model/jobConfig.js|  1 +
 webapp/app/js/services/jobs.js  |  3 +-
 webapp/app/partials/jobs/jobList.html   | 10 +-
 15 files changed, 122 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/798f03ed/core-job/src/main/java/org/apache/kylin/job/constant/JobStatusEnum.java
--
diff --git 
a/core-job/src/main/java/org/apache/kylin/job/constant/JobStatusEnum.java 
b/core-job/src/main/java/org/apache/kylin/job/constant/JobStatusEnum.java
index a4ef564..4c6ac97 100644
--- a/core-job/src/main/java/org/apache/kylin/job/constant/JobStatusEnum.java
+++ b/core-job/src/main/java/org/apache/kylin/job/constant/JobStatusEnum.java
@@ -20,7 +20,7 @@ package org.apache.kylin.job.constant;
 
 public enum JobStatusEnum {
 
-NEW(0), PENDING(1), RUNNING(2), FINISHED(4), ERROR(8), DISCARDED(16);
+NEW(0), PENDING(1), RUNNING(2), FINISHED(4), ERROR(8), DISCARDED(16), 
STOPPED(32);
 
 private final int code;
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/798f03ed/core-job/src/main/java/org/apache/kylin/job/constant/JobStepStatusEnum.java
--
diff --git 
a/core-job/src/main/java/org/apache/kylin/job/constant/JobStepStatusEnum.java 
b/core-job/src/main/java/org/apache/kylin/job/constant/JobStepStatusEnum.java
index 08ee79a..08cd138 100644
--- 
a/core-job/src/main/java/org/apache/kylin/job/constant/JobStepStatusEnum.java
+++ 
b/core-job/src/main/java/org/apache/kylin/job/constant/JobStepStatusEnum.java
@@ -19,7 +19,7 @@
 package org.apache.kylin.job.constant;
 
 public enum JobStepStatusEnum {
-NEW(0), PENDING(1), RUNNING(2), FINISHED(4), ERROR(8), DISCARDED(16), 
WAITING(32), KILLED(64);
+NEW(0), PENDING(1), RUNNING(2), FINISHED(4), ERROR(8), DISCARDED(16), 
WAITING(32), KILLED(64), STOPPED(128);
 
 private final int code;
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/798f03ed/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 80a92de..551241b 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
@@ -380,6 +380,11 @@ public abstract class AbstractExecutable implements 
Executable, Idempotent {
 return status == ExecutableState.DISCARDED;
 }
 
+protected final boolean isPaused() {
+final ExecutableState status = getOutput().getState();
+return status == ExecutableState.STOPPED;
+}
+
 protected boolean needRetry() {
 return this.retry <= config.getJobRetry();
 }

http://git-wip-us.apache.org/repos/asf/kylin/blob/798f03ed/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 fccab30..253072e 100644
--- 
a/core-job/src/main/java/org/apache/kylin/job/execution/DefaultChainedExecutable.java
+++

kylin git commit: KYLIN-227

2016-11-23 Thread shaofengshi 
Repository: kylin
Updated Branches:
  refs/heads/KYLIN-227 [created] f8aa797ac


KYLIN-227


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/f8aa797a
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/f8aa797a
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/f8aa797a

Branch: refs/heads/KYLIN-227
Commit: f8aa797ac3c1e6c5d3f4bf8343b14dcc158c387f
Parents: 9f21d2a
Author: shaofengshi 
Authored: Fri Nov 11 16:11:55 2016 +0800
Committer: shaofengshi 
Committed: Wed Nov 23 18:40:25 2016 +0800

--
 .../kylin/job/constant/JobStatusEnum.java   |  2 +-
 .../kylin/job/constant/JobStepStatusEnum.java   |  2 +-
 .../kylin/job/execution/AbstractExecutable.java |  5 +++
 .../job/execution/DefaultChainedExecutable.java |  6 
 .../kylin/job/execution/ExecutableManager.java  | 11 +-
 .../kylin/job/execution/ExecutableState.java|  7 
 .../job/impl/threadpool/DefaultScheduler.java   |  6 ++--
 .../apache/kylin/job/ExecutableManagerTest.java |  2 +-
 .../test_case_data/sandbox/kylin.properties |  6 ++--
 .../kylin/rest/controller/JobController.java| 22 
 .../apache/kylin/rest/service/CubeService.java  |  2 +-
 .../apache/kylin/rest/service/JobService.java   | 15 
 webapp/app/js/controllers/job.js| 38 +++-
 webapp/app/js/model/jobConfig.js|  1 +
 webapp/app/js/services/jobs.js  |  3 +-
 webapp/app/partials/jobs/jobList.html   | 10 +-
 16 files changed, 125 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/f8aa797a/core-job/src/main/java/org/apache/kylin/job/constant/JobStatusEnum.java
--
diff --git 
a/core-job/src/main/java/org/apache/kylin/job/constant/JobStatusEnum.java 
b/core-job/src/main/java/org/apache/kylin/job/constant/JobStatusEnum.java
index a4ef564..4c6ac97 100644
--- a/core-job/src/main/java/org/apache/kylin/job/constant/JobStatusEnum.java
+++ b/core-job/src/main/java/org/apache/kylin/job/constant/JobStatusEnum.java
@@ -20,7 +20,7 @@ package org.apache.kylin.job.constant;
 
 public enum JobStatusEnum {
 
-NEW(0), PENDING(1), RUNNING(2), FINISHED(4), ERROR(8), DISCARDED(16);
+NEW(0), PENDING(1), RUNNING(2), FINISHED(4), ERROR(8), DISCARDED(16), 
STOPPED(32);
 
 private final int code;
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/f8aa797a/core-job/src/main/java/org/apache/kylin/job/constant/JobStepStatusEnum.java
--
diff --git 
a/core-job/src/main/java/org/apache/kylin/job/constant/JobStepStatusEnum.java 
b/core-job/src/main/java/org/apache/kylin/job/constant/JobStepStatusEnum.java
index 08ee79a..08cd138 100644
--- 
a/core-job/src/main/java/org/apache/kylin/job/constant/JobStepStatusEnum.java
+++ 
b/core-job/src/main/java/org/apache/kylin/job/constant/JobStepStatusEnum.java
@@ -19,7 +19,7 @@
 package org.apache.kylin.job.constant;
 
 public enum JobStepStatusEnum {
-NEW(0), PENDING(1), RUNNING(2), FINISHED(4), ERROR(8), DISCARDED(16), 
WAITING(32), KILLED(64);
+NEW(0), PENDING(1), RUNNING(2), FINISHED(4), ERROR(8), DISCARDED(16), 
WAITING(32), KILLED(64), STOPPED(128);
 
 private final int code;
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/f8aa797a/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 80a92de..551241b 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
@@ -380,6 +380,11 @@ public abstract class AbstractExecutable implements 
Executable, Idempotent {
 return status == ExecutableState.DISCARDED;
 }
 
+protected final boolean isPaused() {
+final ExecutableState status = getOutput().getState();
+return status == ExecutableState.STOPPED;
+}
+
 protected boolean needRetry() {
 return this.retry <= config.getJobRetry();
 }

http://git-wip-us.apache.org/repos/asf/kylin/blob/f8aa797a/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 fccab30..253072e 100644
---