KYLIN-2359 Update job build step name
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/9c985742 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/9c985742 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/9c985742 Branch: refs/heads/master-hbase1.x Commit: 9c985742584a6bf15053d5482d13e1e01f76894d Parents: 809b783 Author: shaofengshi <shaofeng...@apache.org> Authored: Thu Jan 5 12:19:42 2017 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Thu Jan 5 12:19:42 2017 +0800 ---------------------------------------------------------------------- .../org/apache/kylin/job/constant/ExecutableConstants.java | 7 ++++--- .../org/apache/kylin/engine/mr/BatchCubingJobBuilder2.java | 4 ++-- .../org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/9c985742/core-job/src/main/java/org/apache/kylin/job/constant/ExecutableConstants.java ---------------------------------------------------------------------- diff --git a/core-job/src/main/java/org/apache/kylin/job/constant/ExecutableConstants.java b/core-job/src/main/java/org/apache/kylin/job/constant/ExecutableConstants.java index 4ae3add..11c7455 100644 --- a/core-job/src/main/java/org/apache/kylin/job/constant/ExecutableConstants.java +++ b/core-job/src/main/java/org/apache/kylin/job/constant/ExecutableConstants.java @@ -38,9 +38,9 @@ public final class ExecutableConstants { public static final String STEP_NAME_CREATE_FLAT_HIVE_TABLE = "Create Intermediate Flat Hive Table"; public static final String STEP_NAME_MATERIALIZE_HIVE_VIEW_IN_LOOKUP = "Materialize Hive View in Lookup Tables"; public static final String STEP_NAME_FACT_DISTINCT_COLUMNS = "Extract Fact Table Distinct Columns"; - public static final String STEP_NAME_BUILD_BASE_CUBOID = "Build Base Cuboid Data"; - public static final String STEP_NAME_BUILD_IN_MEM_CUBE = "Build Cube"; - public static final String STEP_NAME_BUILD_N_D_CUBOID = "Build N-Dimension Cuboid Data"; + public static final String STEP_NAME_BUILD_BASE_CUBOID = "Build Base Cuboid"; + public static final String STEP_NAME_BUILD_IN_MEM_CUBE = "Build Cube In-Mem"; + public static final String STEP_NAME_BUILD_N_D_CUBOID = "Build N-Dimension Cuboid"; public static final String STEP_NAME_GET_CUBOID_KEY_DISTRIBUTION = "Calculate HTable Region Splits"; public static final String STEP_NAME_CREATE_HBASE_TABLE = "Create HTable"; public static final String STEP_NAME_CONVERT_CUBOID_TO_HFILE = "Convert Cuboid Data to HFile"; @@ -53,6 +53,7 @@ public final class ExecutableConstants { public static final String STEP_NAME_HIVE_CLEANUP = "Hive Cleanup"; public static final String STEP_NAME_KAFKA_CLEANUP = "Kafka Intermediate File Cleanup"; public static final String STEP_NAME_GARBAGE_COLLECTION = "Garbage Collection"; + public static final String STEP_NAME_GARBAGE_COLLECTION_HBASE = "Garbage Collection on HBase"; public static final String STEP_NAME_GARBAGE_COLLECTION_HDFS = "Garbage Collection on HDFS"; public static final String STEP_NAME_REDISTRIBUTE_FLAT_HIVE_TABLE = "Redistribute Flat Hive Table"; public static final String NOTIFY_EMAIL_TEMPLATE = "<div><b>Build Result of Job ${job_name}</b><pre><ul>" + "<li>Build Result: <b>${result}</b></li>" + "<li>Job Engine: ${job_engine}</li>" + "<li>Env: ${env_name}</li>" + "<li>Project: ${project_name}</li>" + "<li>Cube Name: ${cube_name}</li>" + "<li>Source Records Count: ${source_records_count}</li>" + "<li>Start Time: ${start_time}</li>" + "<li>Duration: ${duration}</li>" + "<li>MR Waiting: ${mr_waiting}</li>" + "<li>Last Update Time: ${last_update_time}</li>" + "<li>Submitter: ${submitter}</li>" + "<li>Error Log: ${error_log}</li>" + "</ul></pre><div/>"; http://git-wip-us.apache.org/repos/asf/kylin/blob/9c985742/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchCubingJobBuilder2.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchCubingJobBuilder2.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchCubingJobBuilder2.java index 20540a6..9229a75 100644 --- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchCubingJobBuilder2.java +++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchCubingJobBuilder2.java @@ -43,13 +43,13 @@ public class BatchCubingJobBuilder2 extends JobBuilderSupport { public BatchCubingJobBuilder2(CubeSegment newSegment, String submitter) { super(newSegment, submitter); this.inputSide = MRUtil.getBatchCubingInputSide(seg); - this.outputSide = MRUtil.getBatchCubingOutputSide2((CubeSegment) seg); + this.outputSide = MRUtil.getBatchCubingOutputSide2(seg); } public CubingJob build() { logger.info("MR_V2 new job to BUILD segment " + seg); - final CubingJob result = CubingJob.createBuildJob((CubeSegment) seg, submitter, config); + final CubingJob result = CubingJob.createBuildJob(seg, submitter, config); final String jobId = result.getId(); final String cuboidRootPath = getCuboidRootPath(jobId); http://git-wip-us.apache.org/repos/asf/kylin/blob/9c985742/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 7c2b3fd..6f69e8c 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 @@ -162,7 +162,7 @@ public class HBaseMRSteps extends JobBuilderSupport { public MergeGCStep createMergeGCStep() { MergeGCStep result = new MergeGCStep(); - result.setName(ExecutableConstants.STEP_NAME_GARBAGE_COLLECTION); + result.setName(ExecutableConstants.STEP_NAME_GARBAGE_COLLECTION_HBASE); result.setOldHTables(getMergingHTables()); return result; } @@ -218,7 +218,7 @@ public class HBaseMRSteps extends JobBuilderSupport { toDeletePaths.add(getFactDistinctColumnsPath(jobId)); HDFSPathGarbageCollectionStep step = new HDFSPathGarbageCollectionStep(); - step.setName(ExecutableConstants.STEP_NAME_GARBAGE_COLLECTION); + step.setName(ExecutableConstants.STEP_NAME_GARBAGE_COLLECTION_HBASE); step.setDeletePaths(toDeletePaths); step.setJobId(jobId);
