KYLIN-2333 revert the changes as there is the case that âmandatory only combination is allowedâ
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/df5faf37 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/df5faf37 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/df5faf37 Branch: refs/heads/sparkcubing-rebase Commit: df5faf37cd3186376c28018a5a5a7e42bcea1db9 Parents: 4b5257a Author: shaofengshi <shaofeng...@apache.org> Authored: Thu Jan 5 15:14:37 2017 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Thu Jan 5 15:14:37 2017 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/engine/mr/BatchCubingJobBuilder.java | 3 +-- .../java/org/apache/kylin/engine/mr/BatchCubingJobBuilder2.java | 2 +- .../main/java/org/apache/kylin/engine/mr/JobBuilderSupport.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/df5faf37/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchCubingJobBuilder.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchCubingJobBuilder.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchCubingJobBuilder.java index 8fbecd3..456f615 100644 --- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchCubingJobBuilder.java +++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchCubingJobBuilder.java @@ -65,12 +65,11 @@ public class BatchCubingJobBuilder extends JobBuilderSupport { // Phase 3: Build Cube RowKeyDesc rowKeyDesc = seg.getCubeDesc().getRowkey(); final int groupRowkeyColumnsCount = seg.getCubeDesc().getBuildLevel(); - final int totalRowkeyColumnsCount = rowKeyDesc.getRowKeyColumns().length; final String[] cuboidOutputTempPath = getCuboidOutputPaths(cuboidRootPath, groupRowkeyColumnsCount); // base cuboid step result.addTask(createBaseCuboidStep(cuboidOutputTempPath[0], jobId)); // n dim cuboid steps - for (int i = 1; i < groupRowkeyColumnsCount; i++) { + for (int i = 1; i <= groupRowkeyColumnsCount; i++) { result.addTask(createNDimensionCuboidStep(cuboidOutputTempPath[i - 1], cuboidOutputTempPath[i], i)); } outputSide.addStepPhase3_BuildCube(result, cuboidRootPath); http://git-wip-us.apache.org/repos/asf/kylin/blob/df5faf37/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 9229a75..1e3f078 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 @@ -81,7 +81,7 @@ public class BatchCubingJobBuilder2 extends JobBuilderSupport { // base cuboid step result.addTask(createBaseCuboidStep(cuboidOutputTempPath[0], jobId)); // n dim cuboid steps - for (int i = 1; i < maxLevel; i++) { + for (int i = 1; i <= maxLevel; i++) { result.addTask(createNDimensionCuboidStep(cuboidOutputTempPath[i - 1], cuboidOutputTempPath[i], i, jobId)); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/df5faf37/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 23fce2b..122b8ba 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 @@ -194,7 +194,7 @@ public class JobBuilderSupport { public String[] getCuboidOutputPaths(String cuboidRootPath, int levels) { String[] paths = new String[levels]; - for (int i = 0; i < levels; i++) { + for (int i = 0; i <= levels; i++) { if (i == 0) { paths[i] = cuboidRootPath + "base_cuboid"; } else {
