KYLIN-579 Fix some minor issue on table controller and testcase
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/a14da14e Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/a14da14e Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/a14da14e Branch: refs/heads/1.x-HBase1.1.3 Commit: a14da14ea9ebd647ce9605a896e9014e1b72298d Parents: 9eaf935 Author: lidongsjtu <[email protected]> Authored: Tue Mar 1 00:02:08 2016 +0800 Committer: lidongsjtu <[email protected]> Committed: Tue Mar 1 10:17:19 2016 +0800 ---------------------------------------------------------------------- cube/src/main/java/org/apache/kylin/cube/CubeManager.java | 9 +++++---- .../apache/kylin/rest/controller/TableControllerTest.java | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/a14da14e/cube/src/main/java/org/apache/kylin/cube/CubeManager.java ---------------------------------------------------------------------- diff --git a/cube/src/main/java/org/apache/kylin/cube/CubeManager.java b/cube/src/main/java/org/apache/kylin/cube/CubeManager.java index 6fb907f..8a1a32b 100644 --- a/cube/src/main/java/org/apache/kylin/cube/CubeManager.java +++ b/cube/src/main/java/org/apache/kylin/cube/CubeManager.java @@ -170,7 +170,7 @@ public class CubeManager implements IRealizationProvider { public boolean isTableInCube(String tableName, String projectName) { ProjectManager projectManager = ProjectManager.getInstance(config); - CubeDescManager cubeDescManager = CubeDescManager.getInstance(config); + CubeManager cubeManager = CubeManager.getInstance(config); ProjectInstance projectInstance = projectManager.getProject(projectName); if (projectInstance == null) { throw new IllegalStateException("Cannot find project '" + projectName + "' in project manager"); @@ -178,11 +178,12 @@ public class CubeManager implements IRealizationProvider { for (RealizationEntry projectDataModel : projectInstance.getRealizationEntries()) { if (projectDataModel.getType() == RealizationType.CUBE) { - CubeDesc cubeDesc = cubeDescManager.getCubeDesc(projectDataModel.getRealization()); - if (cubeDesc == null) { - throw new IllegalStateException("Cannot find cube '" + projectDataModel.getRealization() + "' in cubeDesc manager"); + CubeInstance cubeInstance = cubeManager.getCube(projectDataModel.getRealization()); + if (cubeInstance == null) { + throw new IllegalStateException("Cannot find cube '" + projectDataModel.getRealization() + "' in cube manager."); } + CubeDesc cubeDesc = cubeInstance.getDescriptor(); if (cubeDesc.getModel().getAllTables().contains(tableName.toUpperCase())) { return true; } http://git-wip-us.apache.org/repos/asf/kylin/blob/a14da14e/server/src/test/java/org/apache/kylin/rest/controller/TableControllerTest.java ---------------------------------------------------------------------- diff --git a/server/src/test/java/org/apache/kylin/rest/controller/TableControllerTest.java b/server/src/test/java/org/apache/kylin/rest/controller/TableControllerTest.java index 4a48285..e04a30e 100644 --- a/server/src/test/java/org/apache/kylin/rest/controller/TableControllerTest.java +++ b/server/src/test/java/org/apache/kylin/rest/controller/TableControllerTest.java @@ -74,6 +74,6 @@ public class TableControllerTest extends ServiceTestBase { Assert.assertTrue(loadResult.get("result.loaded").length == 2); loadResult = tableController.unLoadHiveTables("TEST_CATEGORY_GROUPINGS","default"); - Assert.assertTrue(loadResult.get("result.unload.success")[0].equals("TEST_CATEGORY_GROUPINGS")); + Assert.assertTrue(loadResult.get("result.unload.fail")[0].equals("TEST_CATEGORY_GROUPINGS")); } }
