KYLIN-3004 code review
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/b55f4967 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/b55f4967 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/b55f4967 Branch: refs/heads/master Commit: b55f4967067f0ecc056d58c9ba081e496f0d2b9e Parents: 0714288 Author: lidongsjtu <[email protected]> Authored: Wed Dec 20 23:35:39 2017 +0800 Committer: lidongsjtu <[email protected]> Committed: Thu Dec 21 00:01:55 2017 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/kylin/rest/msg/Message.java | 5 ++++- .../org/apache/kylin/rest/service/CubeService.java | 11 +++++------ .../kylin/rest/controller/CubeControllerTest.java | 13 +------------ 3 files changed, 10 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/b55f4967/server-base/src/main/java/org/apache/kylin/rest/msg/Message.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/msg/Message.java b/server-base/src/main/java/org/apache/kylin/rest/msg/Message.java index 168d476..adcb082 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/msg/Message.java +++ b/server-base/src/main/java/org/apache/kylin/rest/msg/Message.java @@ -121,6 +121,10 @@ public class Message { return "Cube '%s' doesn't contain any READY segment."; } + public String getDELETE_SEGMENT_CAUSE_GAPS() { + return "Cube '%s' has gaps caused by deleting segment '%s'."; + } + public String getENABLE_WITH_RUNNING_JOB() { return "Enable is not allowed with a running job."; } @@ -174,7 +178,6 @@ public class Message { return "Invalid Model name '%s', only letters, numbers and underline supported."; } - public String getDROP_REFERENCED_MODEL() { return "Model is referenced by Cube '%s' , could not dropped"; } http://git-wip-us.apache.org/repos/asf/kylin/blob/b55f4967/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 3a6f275..435b874 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 @@ -141,8 +141,7 @@ public class CubeService extends BasicService implements InitializingBean { if (modelName != null) { for (CubeInstance cubeInstance : cubeInstances) { - boolean isModelMatch = cubeInstance.getDescriptor().getModelName() - .equalsIgnoreCase(modelName); + boolean isModelMatch = cubeInstance.getDescriptor().getModelName().equalsIgnoreCase(modelName); if (isModelMatch) { filterModelCubes.add(cubeInstance); } @@ -455,7 +454,7 @@ public class CubeService extends BasicService implements InitializingBean { if ("hbase".equals(getConfig().getMetadataUrl().getScheme())) { try { logger.debug("Loading HTable info " + cubeName + ", " + tableName); - + // use reflection to isolate NoClassDef errors when HBase is not available hr = (HBaseResponse) Class.forName("org.apache.kylin.rest.service.HBaseInfoUtil")// .getMethod("getHBaseInfo", new Class[] { String.class, KylinConfig.class })// @@ -506,7 +505,7 @@ public class CubeService extends BasicService implements InitializingBean { if (!segmentName.equals(cube.getSegments().get(0).getName()) && !segmentName.equals(cube.getSegments().get(cube.getSegments().size() - 1).getName())) { - logger.warn(String.format("Cube [%s] gaps caused by deleting segment [%s].", cube.getName(), segmentName)); + logger.warn(String.format(msg.getDELETE_SEGMENT_CAUSE_GAPS(), cube.getName(), segmentName)); } CubeUpdate update = new CubeUpdate(cube); @@ -535,8 +534,8 @@ public class CubeService extends BasicService implements InitializingBean { CubeUpdate update = new CubeUpdate(cube); update.setToRemoveSegs(cube.getSegments().toArray(new CubeSegment[cube.getSegments().size()])); - update.setCuboids(Maps.<Long, Long> newHashMap()); - update.setCuboidsRecommend(Sets.<Long> newHashSet()); + update.setCuboids(Maps.<Long, Long>newHashMap()); + update.setCuboidsRecommend(Sets.<Long>newHashSet()); CubeManager.getInstance(getConfig()).updateCube(update); } http://git-wip-us.apache.org/repos/asf/kylin/blob/b55f4967/server/src/test/java/org/apache/kylin/rest/controller/CubeControllerTest.java ---------------------------------------------------------------------- diff --git a/server/src/test/java/org/apache/kylin/rest/controller/CubeControllerTest.java b/server/src/test/java/org/apache/kylin/rest/controller/CubeControllerTest.java index 2c91d90..97c91ad 100644 --- a/server/src/test/java/org/apache/kylin/rest/controller/CubeControllerTest.java +++ b/server/src/test/java/org/apache/kylin/rest/controller/CubeControllerTest.java @@ -146,15 +146,6 @@ public class CubeControllerTest extends ServiceTestBase { cubeController.deleteSegment(cubeName, "not_exist_segment"); } - @Test(expected = InternalErrorException.class) - public void testDeleteSegmentInMiddle() throws IOException { - String cubeName = "test_kylin_cube_with_slr_ready_3_segments"; - CubeDesc[] cubes = cubeDescController.getCube(cubeName); - Assert.assertNotNull(cubes); - - cubeController.deleteSegment(cubeName, "20131112000000_20131212000000"); - } - @Test public void testDeleteSegmentFromHead() throws IOException { String cubeName = "test_kylin_cube_with_slr_ready_3_segments"; @@ -170,7 +161,6 @@ public class CubeControllerTest extends ServiceTestBase { Assert.assertTrue(segNumber == newSegNumber + 1); } - @Test public void testGetHoles() throws IOException { String cubeName = "test_kylin_cube_with_slr_ready_3_segments"; @@ -180,7 +170,7 @@ public class CubeControllerTest extends ServiceTestBase { CubeInstance cube = cubeService.getCubeManager().getCube(cubeName); List<CubeSegment> segments = cube.getSegments(); - final long dateEnd = segments.get(segments.size() -1).getTSRange().end.v; + final long dateEnd = segments.get(segments.size() - 1).getTSRange().end.v; final long ONEDAY = 24 * 60 * 60000; cubeService.getCubeManager().appendSegment(cube, new TSRange(dateEnd + ONEDAY, dateEnd + ONEDAY * 2)); @@ -194,7 +184,6 @@ public class CubeControllerTest extends ServiceTestBase { Assert.assertTrue(hole.getTSRange().equals(new TSRange(dateEnd, dateEnd + ONEDAY))); } - @Test public void testGetCubes() { List<CubeInstance> cubes = cubeController.getCubes(null, null, null, 1, 0);
