kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaofeng...@apache.org
Subject kylin git commit: KYLIN-1859 use segment uuid to replace name as param to mr jobs
Date Thu, 11 Aug 2016 02:45:00 GMT
Repository: kylin
Updated Branches:
  refs/heads/master a00f9d74d -> a87bbadf9


KYLIN-1859 use segment uuid to replace name as param to mr jobs

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

Branch: refs/heads/master
Commit: a87bbadf985fecbe8c2b1740b89266e9faae4f35
Parents: a00f9d7
Author: shaofengshi <shaofengshi@apache.org>
Authored: Thu Aug 11 10:44:48 2016 +0800
Committer: shaofengshi <shaofengshi@apache.org>
Committed: Thu Aug 11 10:44:48 2016 +0800

----------------------------------------------------------------------
 .../kylin/engine/mr/BatchMergeJobBuilder2.java  | 22 --------------------
 .../kylin/storage/hbase/steps/HBaseMRSteps.java |  2 +-
 2 files changed, 1 insertion(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/a87bbadf/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder2.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder2.java
b/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder2.java
index 71a20a1..b504dbf 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder2.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder2.java
@@ -21,9 +21,7 @@ package org.apache.kylin.engine.mr;
 import java.util.List;
 
 import org.apache.kylin.cube.CubeSegment;
-import org.apache.kylin.engine.mr.common.AbstractHadoopJob;
 import org.apache.kylin.engine.mr.steps.CubingExecutableUtil;
-import org.apache.kylin.engine.mr.steps.MergeCuboidJob;
 import org.apache.kylin.engine.mr.steps.MergeStatisticsStep;
 import org.apache.kylin.job.constant.ExecutableConstants;
 import org.slf4j.Logger;
@@ -85,24 +83,4 @@ public class BatchMergeJobBuilder2 extends JobBuilderSupport {
 
         return result;
     }
-
-    protected Class<? extends AbstractHadoopJob> getMergeCuboidJob() {
-        return MergeCuboidJob.class;
-//    private MapReduceExecutable createMergeCuboidDataStep(CubeSegment seg, String inputPath,
String outputPath) {
-//        MapReduceExecutable mergeCuboidDataStep = new MapReduceExecutable();
-//        mergeCuboidDataStep.setName(ExecutableConstants.STEP_NAME_MERGE_CUBOID);
-//        StringBuilder cmd = new StringBuilder();
-//
-//        appendMapReduceParameters(cmd);
-//        appendExecCmdParameters(cmd, BatchConstants.ARG_CUBE_NAME, seg.getCubeInstance().getName());
-//        appendExecCmdParameters(cmd, BatchConstants.ARG_SEGMENT_ID, seg.getUuid());
-//        appendExecCmdParameters(cmd, BatchConstants.ARG_INPUT, inputPath);
-//        appendExecCmdParameters(cmd, BatchConstants.ARG_OUTPUT, outputPath);
-//        appendExecCmdParameters(cmd, BatchConstants.ARG_JOB_NAME, "Kylin_Merge_Cuboid_"
+ seg.getCubeInstance().getName() + "_Step");
-//
-//        mergeCuboidDataStep.setMapReduceParams(cmd.toString());
-//        mergeCuboidDataStep.setMapReduceJobClass(MergeCuboidJob.class);
-//        return mergeCuboidDataStep;
-    }
-
 }

http://git-wip-us.apache.org/repos/asf/kylin/blob/a87bbadf/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java
index 0679feb..1bd052d 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java
@@ -112,7 +112,7 @@ public class HBaseMRSteps extends JobBuilderSupport {
 
         appendMapReduceParameters(cmd);
         appendExecCmdParameters(cmd, BatchConstants.ARG_CUBE_NAME, seg.getCubeInstance().getName());
-        appendExecCmdParameters(cmd, BatchConstants.ARG_SEGMENT_NAME, seg.getName());
+        appendExecCmdParameters(cmd, BatchConstants.ARG_SEGMENT_ID, seg.getUuid());
         appendExecCmdParameters(cmd, BatchConstants.ARG_INPUT, formattedPath);
         appendExecCmdParameters(cmd, BatchConstants.ARG_OUTPUT, outputPath);
         appendExecCmdParameters(cmd, BatchConstants.ARG_JOB_NAME, "Kylin_Merge_Cuboid_" +
seg.getCubeInstance().getName() + "_Step");


Mime
View raw message