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 2015/01/23 09:31:54 UTC
[07/50] [abbrv] incubator-kylin git commit: minor fix
minor fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/40d36537
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/40d36537
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/40d36537
Branch: refs/heads/inverted-index
Commit: 40d36537d39eff6d49d87af047acefaa6d13d5c9
Parents: 4c48cfc
Author: qianhao.zhou <qi...@ebay.com>
Authored: Thu Jan 22 11:51:27 2015 +0800
Committer: qianhao.zhou <qi...@ebay.com>
Committed: Thu Jan 22 11:51:27 2015 +0800
----------------------------------------------------------------------
cube/src/main/java/com/kylinolap/cube/CubeInstance.java | 10 ----------
.../java/com/kylinolap/job/cube/CubingJobBuilder.java | 2 +-
.../job/impl/threadpool/DefaultChainedExecutable.java | 6 ++++--
3 files changed, 5 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40d36537/cube/src/main/java/com/kylinolap/cube/CubeInstance.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/com/kylinolap/cube/CubeInstance.java b/cube/src/main/java/com/kylinolap/cube/CubeInstance.java
index 798664a..f3e08ec 100644
--- a/cube/src/main/java/com/kylinolap/cube/CubeInstance.java
+++ b/cube/src/main/java/com/kylinolap/cube/CubeInstance.java
@@ -82,9 +82,6 @@ public class CubeInstance extends RootPersistentEntity implements IRealization {
@JsonProperty("create_time_utc")
private long createTimeUTC;
- @JsonProperty("notify_list")
- private String notifyList;
-
private String projectName;
public List<CubeSegment> getBuildingSegments() {
@@ -458,11 +455,4 @@ public class CubeInstance extends RootPersistentEntity implements IRealization {
this.projectName = projectName;
}
- public String getNotifyList() {
- return notifyList;
- }
-
- public void setNotifyList(String notifyList) {
- this.notifyList = notifyList;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40d36537/job/src/main/java/com/kylinolap/job/cube/CubingJobBuilder.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/com/kylinolap/job/cube/CubingJobBuilder.java b/job/src/main/java/com/kylinolap/job/cube/CubingJobBuilder.java
index b94360a..9215d85 100644
--- a/job/src/main/java/com/kylinolap/job/cube/CubingJobBuilder.java
+++ b/job/src/main/java/com/kylinolap/job/cube/CubingJobBuilder.java
@@ -54,7 +54,7 @@ public final class CubingJobBuilder extends AbstractJobBuilder {
final int totalRowkeyColumnsCount = getCubeDesc().getRowkey().getRowKeyColumns().length;
CubingJob result = initialJob("BUILD");
- result.setNotifyList(((CubeSegment) segment).getCubeInstance().getNotifyList());
+ result.setNotifyList(((CubeSegment) segment).getCubeInstance().getDescriptor().getNotifyList());
final String jobId = result.getId();
final CubeJoinedFlatTableDesc intermediateTableDesc = new CubeJoinedFlatTableDesc(getCubeDesc(), (CubeSegment) this.segment);
final String intermediateHiveTableName = getIntermediateHiveTableName(intermediateTableDesc, jobId);
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40d36537/job/src/main/java/com/kylinolap/job/impl/threadpool/DefaultChainedExecutable.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/com/kylinolap/job/impl/threadpool/DefaultChainedExecutable.java b/job/src/main/java/com/kylinolap/job/impl/threadpool/DefaultChainedExecutable.java
index 9378482..b7bb840 100644
--- a/job/src/main/java/com/kylinolap/job/impl/threadpool/DefaultChainedExecutable.java
+++ b/job/src/main/java/com/kylinolap/job/impl/threadpool/DefaultChainedExecutable.java
@@ -55,8 +55,8 @@ public class DefaultChainedExecutable extends AbstractExecutable implements Chai
@Override
protected void onExecuteFinished(ExecuteResult result, ExecutableContext executableContext) {
- setEndTime(System.currentTimeMillis());
if (isDiscarded()) {
+ setEndTime(System.currentTimeMillis());
notifyUserStatusChange(ExecutableState.DISCARDED);
} else if (result.succeed()) {
List<? extends Executable> jobs = getTasks();
@@ -72,16 +72,18 @@ public class DefaultChainedExecutable extends AbstractExecutable implements Chai
}
}
if (allSucceed) {
+ setEndTime(System.currentTimeMillis());
jobService.updateJobOutput(getId(), ExecutableState.SUCCEED, null, null);
notifyUserStatusChange(ExecutableState.SUCCEED);
} else if (hasError) {
+ setEndTime(System.currentTimeMillis());
jobService.updateJobOutput(getId(), ExecutableState.ERROR, null, null);
notifyUserStatusChange(ExecutableState.ERROR);
} else {
- notifyUserStatusChange(ExecutableState.READY);
jobService.updateJobOutput(getId(), ExecutableState.READY, null, null);
}
} else {
+ setEndTime(System.currentTimeMillis());
jobService.updateJobOutput(getId(), ExecutableState.ERROR, null, null);
notifyUserStatusChange(ExecutableState.ERROR);
}