From bd2fde13e58b27b4a09432c6c2f9589b25d91f34 Mon Sep 17 00:00:00 2001 From: kangkaisen Date: Tue, 22 Nov 2016 21:26:32 +0800 Subject: [PATCH] KYLIN-2220 Enforce same name between Cube & CubeDesc --- .../java/org/apache/kylin/rest/controller/CubeController.java | 2 +- .../src/main/java/org/apache/kylin/rest/service/CubeService.java | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) 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."); 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 f0371d1..85ff52e 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 * -- 2.9.3 (Apple Git-75)