From fdfd31e0d6be87696dd16f95e470b25d3a11e473 Mon Sep 17 00:00:00 2001 From: "qianhao.zhou" Date: Fri, 28 Nov 2014 11:10:29 +0800 Subject: [PATCH] fix compile issue --- job/src/main/java/com/kylinolap/job/JobInstanceBuilder.java | 2 +- job/src/main/java/com/kylinolap/job/JoinedFlatTable.java | 2 +- job/src/main/java/com/kylinolap/job/flow/JobFlowListener.java | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/job/src/main/java/com/kylinolap/job/JobInstanceBuilder.java b/job/src/main/java/com/kylinolap/job/JobInstanceBuilder.java index 3a9a77e..a17c0ff 100644 --- a/job/src/main/java/com/kylinolap/job/JobInstanceBuilder.java +++ b/job/src/main/java/com/kylinolap/job/JobInstanceBuilder.java @@ -212,7 +212,7 @@ private String getRowkeyDistributionOutputPath() { final String cuboidRootPath = jobWorkingDir + "/" + cubeName + "/cuboid/"; final String cuboidTmpRootPath = jobWorkingDir + "/" + cubeName + "/tmp_cuboid/"; - final boolean incBuildMerge = cube.needMergeImmediatelyAfterBuild(); + final boolean incBuildMerge = cube.needMergeImmediatelyAfterBuild(cubeSegment); String[] cuboidOutputTempPath = getCuboidOutputPaths(incBuildMerge?cuboidTmpRootPath:cuboidRootPath, totalRowkeyColumnsCount, groupRowkeyColumnsCount); // base cuboid step diff --git a/job/src/main/java/com/kylinolap/job/JoinedFlatTable.java b/job/src/main/java/com/kylinolap/job/JoinedFlatTable.java index b2ba4dd..c5f93b4 100644 --- a/job/src/main/java/com/kylinolap/job/JoinedFlatTable.java +++ b/job/src/main/java/com/kylinolap/job/JoinedFlatTable.java @@ -187,7 +187,7 @@ private static void appendWhereStatement(JoinedFlatTableDesc intermediateTableDe long dateStart = cubeSegment.getDateRangeStart(); long dateEnd = cubeSegment.getDateRangeEnd(); - if (cubeSegment.getCubeInstance().needMergeImmediatelyAfterBuild()) { + if (cubeSegment.getCubeInstance().needMergeImmediatelyAfterBuild(cubeSegment)) { dateStart = cubeSegment.getCubeInstance().getDateRange()[1]; } if (!(dateStart == 0 && dateEnd == 0)) { diff --git a/job/src/main/java/com/kylinolap/job/flow/JobFlowListener.java b/job/src/main/java/com/kylinolap/job/flow/JobFlowListener.java index ddf8471..b4ab3ea 100644 --- a/job/src/main/java/com/kylinolap/job/flow/JobFlowListener.java +++ b/job/src/main/java/com/kylinolap/job/flow/JobFlowListener.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.concurrent.ConcurrentHashMap; +import com.kylinolap.cube.CubeSegmentStatusEnum; import org.apache.commons.lang.exception.ExceptionUtils; import org.quartz.JobDataMap; import org.quartz.JobDetail; @@ -251,6 +252,7 @@ private void updateCubeSegmentInfoOnSucceed(JobInstance jobInstance, JobEngineCo CubeManager cubeMgr = CubeManager.getInstance(engineConfig.getConfig()); CubeInstance cubeInstance = cubeMgr.getCube(jobInstance.getRelatedCube()); + CubeSegment newSegment = cubeInstance.getSegmentById(jobInstance.getUuid()); long sourceCount = 0; long sourceSize = 0; @@ -278,8 +280,8 @@ private void updateCubeSegmentInfoOnSucceed(JobInstance jobInstance, JobEngineCo log.info("No step with name '" + JobConstants.STEP_NAME_CREATE_FLAT_HIVE_TABLE + "' is found"); } - if (cubeInstance.needMergeImmediatelyAfterBuild()) { - for (CubeSegment seg : cubeInstance.getMergingSegments()) { + if (cubeInstance.needMergeImmediatelyAfterBuild(newSegment)) { + for (CubeSegment seg : cubeInstance.getSegment(CubeSegmentStatusEnum.READY)) { sourceCount += seg.getSourceRecords(); sourceSize += seg.getSourceRecordsSize(); }