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 2018/05/26 10:53:23 UTC
[kylin] 07/08: Minor, add member "displayCubeName" for job instance
This is an automated email from the ASF dual-hosted git repository.
liyang pushed a commit to branch sync
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 2032c04bcfbf9f361439951dd73240d79a21c13b
Author: nichunen <ch...@kyligence.io>
AuthorDate: Mon May 14 13:17:53 2018 +0800
Minor, add member "displayCubeName" for job instance
---
.../src/main/java/org/apache/kylin/job/JobInstance.java | 15 +++++++++++++++
.../apache/kylin/engine/mr/common/JobInfoConverter.java | 4 +++-
.../java/org/apache/kylin/rest/service/JobService.java | 8 ++++++--
.../java/org/apache/kylin/tool/JobInstanceExtractor.java | 7 +++++--
4 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/core-job/src/main/java/org/apache/kylin/job/JobInstance.java b/core-job/src/main/java/org/apache/kylin/job/JobInstance.java
index e7c0aa0..a2c3459 100644
--- a/core-job/src/main/java/org/apache/kylin/job/JobInstance.java
+++ b/core-job/src/main/java/org/apache/kylin/job/JobInstance.java
@@ -22,6 +22,7 @@ import java.util.Collection;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
+import org.apache.commons.lang3.StringUtils;
import org.apache.kylin.common.persistence.RootPersistentEntity;
import org.apache.kylin.cube.model.CubeBuildTypeEnum;
import org.apache.kylin.job.constant.JobStatusEnum;
@@ -52,6 +53,8 @@ public class JobInstance extends RootPersistentEntity implements Comparable<JobI
private long duration;
@JsonProperty("related_cube")
private String relatedCube;
+ @JsonProperty("display_cube_name")
+ private String displayCubeName;
@JsonProperty("related_segment")
private String relatedSegment;
@JsonProperty("exec_start_time")
@@ -176,6 +179,18 @@ public class JobInstance extends RootPersistentEntity implements Comparable<JobI
this.relatedCube = relatedCube;
}
+ public String getDisplayCubeName() {
+ if (StringUtils.isBlank(displayCubeName)) {
+ return relatedCube;
+ } else {
+ return displayCubeName;
+ }
+ }
+
+ public void setDisplayCubeName(String displayCubeName) {
+ this.displayCubeName = displayCubeName;
+ }
+
public String getRelatedSegment() {
return relatedSegment;
}
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/JobInfoConverter.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/JobInfoConverter.java
index ad8b954..862d7e5 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/JobInfoConverter.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/JobInfoConverter.java
@@ -76,7 +76,8 @@ public class JobInfoConverter {
final JobInstance result = new JobInstance();
result.setName(job.getName());
- result.setRelatedCube(cube != null ? cube.getDisplayName() : CubingExecutableUtil.getCubeName(cubeJob.getParams()));
+ result.setRelatedCube(cube != null ? cube.getName() : CubingExecutableUtil.getCubeName(cubeJob.getParams()));
+ result.setDisplayCubeName(cube != null ? cube.getDisplayName() : CubingExecutableUtil.getCubeName(cubeJob.getParams()));
result.setRelatedSegment(CubingExecutableUtil.getSegmentId(cubeJob.getParams()));
result.setLastModified(output.getLastModified());
result.setSubmitter(job.getSubmitter());
@@ -111,6 +112,7 @@ public class JobInfoConverter {
final JobInstance result = new JobInstance();
result.setName(job.getName());
result.setRelatedCube(CubingExecutableUtil.getCubeName(job.getParams()));
+ result.setDisplayCubeName(CubingExecutableUtil.getCubeName(job.getParams()));
result.setLastModified(output.getLastModified());
result.setSubmitter(job.getSubmitter());
result.setUuid(job.getId());
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 4317ed5..e120d43 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
@@ -461,9 +461,12 @@ public class JobService extends BasicService implements InitializingBean {
final JobInstance result = new JobInstance();
result.setName(job.getName());
if (cube != null) {
- result.setRelatedCube(cube.getDisplayName());
+ result.setRelatedCube(cube.getName());
+ result.setDisplayCubeName(cube.getDisplayName());
} else {
- result.setRelatedCube(CubingExecutableUtil.getCubeName(cubeJob.getParams()));
+ String cubeName = CubingExecutableUtil.getCubeName(cubeJob.getParams());
+ result.setRelatedCube(cubeName);
+ result.setDisplayCubeName(cubeName);
}
result.setRelatedSegment(CubingExecutableUtil.getSegmentId(cubeJob.getParams()));
result.setLastModified(cubeJob.getLastModified());
@@ -494,6 +497,7 @@ public class JobService extends BasicService implements InitializingBean {
final JobInstance result = new JobInstance();
result.setName(job.getName());
result.setRelatedCube(CubingExecutableUtil.getCubeName(job.getParams()));
+ result.setDisplayCubeName(CubingExecutableUtil.getCubeName(job.getParams()));
result.setLastModified(job.getLastModified());
result.setSubmitter(job.getSubmitter());
result.setUuid(job.getId());
diff --git a/tool/src/main/java/org/apache/kylin/tool/JobInstanceExtractor.java b/tool/src/main/java/org/apache/kylin/tool/JobInstanceExtractor.java
index 6153b7f..bc61f94 100644
--- a/tool/src/main/java/org/apache/kylin/tool/JobInstanceExtractor.java
+++ b/tool/src/main/java/org/apache/kylin/tool/JobInstanceExtractor.java
@@ -131,9 +131,12 @@ public class JobInstanceExtractor extends AbstractInfoExtractor {
final JobInstance result = new JobInstance();
result.setName(cubeJob.getName());
if (cube != null) {
- result.setRelatedCube(cube.getDisplayName());
+ result.setRelatedCube(cube.getName());
+ result.setDisplayCubeName(cube.getDisplayName());
} else {
- result.setRelatedCube(CubingExecutableUtil.getCubeName(cubeJob.getParams()));
+ String cubeName = CubingExecutableUtil.getCubeName(cubeJob.getParams());
+ result.setRelatedCube(cubeName);
+ result.setDisplayCubeName(cubeName);
}
result.setRelatedSegment(CubingExecutableUtil.getSegmentId(cubeJob.getParams()));
result.setLastModified(output.getLastModified());
--
To stop receiving notification emails like this one, please contact
liyang@apache.org.