You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2016/04/10 02:13:46 UTC
kylin git commit: KYLIN-1560 add parameter indexPath
Repository: kylin
Updated Branches:
refs/heads/master f6cde56f0 -> 0b2123b4b
KYLIN-1560 add parameter indexPath
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/0b2123b4
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/0b2123b4
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/0b2123b4
Branch: refs/heads/master
Commit: 0b2123b4b9cd9fddf18a63a210166c34ffd1bd26
Parents: f6cde56
Author: shaofengshi <sh...@apache.org>
Authored: Sun Apr 10 08:11:17 2016 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Sun Apr 10 08:11:27 2016 +0800
----------------------------------------------------------------------
.../org/apache/kylin/engine/mr/JobBuilderSupport.java | 6 ++----
.../kylin/engine/mr/steps/CubingExecutableUtil.java | 10 ++++++++++
.../engine/mr/steps/UpdateCubeInfoAfterBuildStep.java | 1 +
.../engine/mr/steps/UpdateCubeInfoAfterMergeStep.java | 1 +
4 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/0b2123b4/engine-mr/src/main/java/org/apache/kylin/engine/mr/JobBuilderSupport.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/JobBuilderSupport.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/JobBuilderSupport.java
index d5fceeb..c4fc6b9 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/JobBuilderSupport.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/JobBuilderSupport.java
@@ -103,6 +103,7 @@ public class JobBuilderSupport {
CubingExecutableUtil.setCubeName(seg.getRealization().getName(), result.getParams());
CubingExecutableUtil.setSegmentId(seg.getUuid(), result.getParams());
CubingExecutableUtil.setCubingJobId(jobId, result.getParams());
+ CubingExecutableUtil.setIndexPath(this.getSecondaryIndexPath(jobId), result.getParams());
return result;
}
@@ -126,6 +127,7 @@ public class JobBuilderSupport {
CubingExecutableUtil.setSegmentId(seg.getUuid(), result.getParams());
CubingExecutableUtil.setCubingJobId(jobId, result.getParams());
CubingExecutableUtil.setMergingSegmentIds(mergingSegmentIds, result.getParams());
+ CubingExecutableUtil.setIndexPath(this.getSecondaryIndexPath(jobId), result.getParams());
return result;
}
@@ -156,10 +158,6 @@ public class JobBuilderSupport {
return getCuboidRootPath(seg.getLastBuildJobID());
}
- public String getSecondaryIndexPath(CubeSegment seg) {
- return getSecondaryIndexPath(seg.getLastBuildJobID());
- }
-
public String getSecondaryIndexPath(String jobId) {
return getRealizationRootPath(jobId) + "/secondary_index/";
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/0b2123b4/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/CubingExecutableUtil.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/CubingExecutableUtil.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/CubingExecutableUtil.java
index ab4a1de..9e46ded 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/CubingExecutableUtil.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/CubingExecutableUtil.java
@@ -35,6 +35,7 @@ public class CubingExecutableUtil {
public static final String STATISTICS_PATH = "statisticsPath";
public static final String CUBING_JOB_ID = "cubingJobId";
public static final String MERGED_STATISTICS_PATH = "mergedStatisticsPath";
+ public static final String INDEX_PATH = "indexPath";
public static void setStatisticsPath(String path, Map<String, String> params) {
params.put(STATISTICS_PATH, path);
@@ -93,4 +94,13 @@ public class CubingExecutableUtil {
public static String getMergedStatisticsPath(Map<String, String> params) {
return params.get(MERGED_STATISTICS_PATH);
}
+
+ public static void setIndexPath(String indexPath, Map<String, String> params) {
+ params.put(INDEX_PATH, indexPath);
+ }
+
+ public static String getIndexPath(Map<String, String> params) {
+ return params.get(INDEX_PATH);
+ }
+
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/0b2123b4/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/UpdateCubeInfoAfterBuildStep.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/UpdateCubeInfoAfterBuildStep.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/UpdateCubeInfoAfterBuildStep.java
index c41aaf1..137f6c2 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/UpdateCubeInfoAfterBuildStep.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/UpdateCubeInfoAfterBuildStep.java
@@ -49,6 +49,7 @@ public class UpdateCubeInfoAfterBuildStep extends AbstractExecutable {
long cubeSizeBytes = cubingJob.findCubeSizeBytes();
segment.setLastBuildJobID(CubingExecutableUtil.getCubingJobId(this.getParams()));
+ segment.setIndexPath(CubingExecutableUtil.getIndexPath(this.getParams()));
segment.setLastBuildTime(System.currentTimeMillis());
segment.setSizeKB(cubeSizeBytes / 1024);
segment.setInputRecords(sourceCount);
http://git-wip-us.apache.org/repos/asf/kylin/blob/0b2123b4/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/UpdateCubeInfoAfterMergeStep.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/UpdateCubeInfoAfterMergeStep.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/UpdateCubeInfoAfterMergeStep.java
index d3ed68a..38ed906 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/UpdateCubeInfoAfterMergeStep.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/UpdateCubeInfoAfterMergeStep.java
@@ -77,6 +77,7 @@ public class UpdateCubeInfoAfterMergeStep extends AbstractExecutable {
mergedSegment.setInputRecords(sourceCount);
mergedSegment.setInputRecordsSize(sourceSize);
mergedSegment.setLastBuildJobID(CubingExecutableUtil.getCubingJobId(this.getParams()));
+ mergedSegment.setIndexPath(CubingExecutableUtil.getIndexPath(this.getParams()));
mergedSegment.setLastBuildTime(System.currentTimeMillis());
try {