Repository: kylin Updated Branches: refs/heads/1.x-staging 0a74e9cb4 -> 24b7aa7f7
minor, patch a NPE in CubeService.isCubeInProject() Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/24b7aa7f Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/24b7aa7f Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/24b7aa7f Branch: refs/heads/1.x-staging Commit: 24b7aa7f700d66e4860c6eeca78ef173e4e2ef8b Parents: 0a74e9c Author: Li, Yang <liy...@apache.org> Authored: Mon Feb 15 18:11:50 2016 +0800 Committer: Li, Yang <liy...@apache.org> Committed: Mon Feb 15 18:11:50 2016 +0800 ---------------------------------------------------------------------- .../org/apache/kylin/rest/service/CubeService.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/24b7aa7f/server/src/main/java/org/apache/kylin/rest/service/CubeService.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/kylin/rest/service/CubeService.java b/server/src/main/java/org/apache/kylin/rest/service/CubeService.java index 52bbdc4..601814c 100644 --- a/server/src/main/java/org/apache/kylin/rest/service/CubeService.java +++ b/server/src/main/java/org/apache/kylin/rest/service/CubeService.java @@ -19,7 +19,6 @@ package org.apache.kylin.rest.service; import java.io.IOException; -import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -64,10 +63,8 @@ import org.apache.kylin.rest.exception.InternalErrorException; import org.apache.kylin.rest.request.MetricsRequest; import org.apache.kylin.rest.response.HBaseResponse; import org.apache.kylin.rest.response.MetricsResponse; -import org.apache.kylin.rest.security.AclPermission; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Caching; import org.springframework.security.access.prepost.PostFilter; @@ -157,7 +154,7 @@ public class CubeService extends BasicService { desc.init(getConfig(), getMetadataManager().getAllTablesMap()); int cuboidCount = CuboidCLI.simulateCuboidGeneration(desc); logger.info("New cube " + cubeName + " has " + cuboidCount + " cuboids"); - + boolean isNew = false; if (getCubeDescManager().getCubeDesc(desc.getName()) == null) { createdDesc = getCubeDescManager().createCubeDesc(desc); @@ -205,7 +202,10 @@ public class CubeService extends BasicService { for (RealizationEntry projectRealization : project.getRealizationEntries()) { if (projectRealization != null && projectRealization.getType() == RealizationType.CUBE) { CubeInstance cube = getCubeManager().getCube(projectRealization.getRealization()); - assert cube != null; + if (cube == null) { + logger.error("Project " + projectName + " contains realization " + projectRealization.getRealization() + " which is not found by CubeManager"); + continue; + } if (cube.equals(target)) { return true; } @@ -229,7 +229,7 @@ public class CubeService extends BasicService { if (!updatedCubeDesc.getError().isEmpty()) { return updatedCubeDesc; } - + getCubeManager().updateCube(cube); return updatedCubeDesc; @@ -494,7 +494,7 @@ public class CubeService extends BasicService { cube.getSegments().clear(); CubeManager.getInstance(getConfig()).updateCube(cube); } - + private void discardAllRunningJobs(CubeInstance cube) { final List<CubingJob> cubingJobs = listAllCubingJobs(cube.getName(), null); for (CubingJob cubingJob : cubingJobs) {
