Repository: kylin Updated Branches: refs/heads/KYLIN-2217-2 d14de80ee -> 7b50d3163 (forced update)
KYLIN-2220 Enforce same name between Cube & CubeDesc Signed-off-by: Li Yang <liy...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/7fe7fc3e Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/7fe7fc3e Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/7fe7fc3e Branch: refs/heads/KYLIN-2217-2 Commit: 7fe7fc3e36863c988ebdd9f34807291aac0aa556 Parents: 6afcb26 Author: kangkaisen <kangkai...@live.com> Authored: Tue Nov 22 21:26:32 2016 +0800 Committer: Li Yang <liy...@apache.org> Committed: Fri Nov 25 09:46:55 2016 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/cube/CubeManager.java | 19 +------------------ .../kylin/rest/controller/CubeController.java | 2 +- .../apache/kylin/rest/service/CubeService.java | 8 -------- 3 files changed, 2 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/7fe7fc3e/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java ---------------------------------------------------------------------- diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java b/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java index 9893040..307bb46 100644 --- a/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java +++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java @@ -617,24 +617,6 @@ public class CubeManager implements IRealizationProvider { } } - private long calculateStartOffsetForAppendSegment(CubeInstance cube) { - List<CubeSegment> existing = cube.getSegments(); - if (existing.isEmpty()) { - return 0; - } else { - return existing.get(existing.size() - 1).getSourceOffsetEnd(); - } - } - - private long calculateStartDateForAppendSegment(CubeInstance cube) { - List<CubeSegment> existing = cube.getSegments(); - if (existing.isEmpty()) { - return cube.getDescriptor().getPartitionDateStart(); - } else { - return existing.get(existing.size() - 1).getDateRangeEnd(); - } - } - private void checkBuildingSegment(CubeInstance cube) { int maxBuldingSeg = cube.getConfig().getMaxBuildingSegments(); if (cube.getBuildingSegments().size() >= maxBuldingSeg) { @@ -923,6 +905,7 @@ public class CubeManager implements IRealizationProvider { CubeDesc cubeDesc = CubeDescManager.getInstance(config).getCubeDesc(cube.getDescName()); checkNotNull(cubeDesc, "cube descriptor '%s' (for cube '%s') not found", cube.getDescName(), cubeName); + checkState(cubeDesc.getName().equals(cubeName), "cube name '%s' must be same as descriptor name '%s', but it is not", cubeName, cubeDesc.getName()); if (!cubeDesc.getError().isEmpty()) { cube.setStatus(RealizationStatusEnum.DESCBROKEN); http://git-wip-us.apache.org/repos/asf/kylin/blob/7fe7fc3e/server-base/src/main/java/org/apache/kylin/rest/controller/CubeController.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/CubeController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/CubeController.java index e1aa17a..3846d28 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller/CubeController.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller/CubeController.java @@ -416,7 +416,7 @@ public class CubeController extends BasicController { cubeRequest.setMessage("CubeDesc is null."); return cubeRequest; } - String name = CubeService.getCubeNameFromDesc(desc.getName()); + String name = desc.getName(); if (StringUtils.isEmpty(name)) { logger.info("Cube name should not be empty."); throw new BadRequestException("Cube name should not be empty."); http://git-wip-us.apache.org/repos/asf/kylin/blob/7fe7fc3e/server-base/src/main/java/org/apache/kylin/rest/service/CubeService.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/CubeService.java b/server-base/src/main/java/org/apache/kylin/rest/service/CubeService.java index 5c59e1a..85c9284 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/service/CubeService.java +++ b/server-base/src/main/java/org/apache/kylin/rest/service/CubeService.java @@ -278,14 +278,6 @@ public class CubeService extends BasicService { accessService.clean(cube, true); } - public static String getCubeNameFromDesc(String descName) { - if (descName.toLowerCase().endsWith(DESC_SUFFIX)) { - return descName.substring(0, descName.toLowerCase().indexOf(DESC_SUFFIX)); - } else { - return descName; - } - } - /** * Stop all jobs belonging to this cube and clean out all segments *
