You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2018/02/09 05:55:42 UTC
kylin git commit: KYLIN-3223 fix compile
Repository: kylin
Updated Branches:
refs/heads/master 0550cc3a0 -> d4f9d564b
KYLIN-3223 fix compile
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/d4f9d564
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/d4f9d564
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/d4f9d564
Branch: refs/heads/master
Commit: d4f9d564bc643c5fd4375f2eb5d5ad15caa31269
Parents: 0550cc3
Author: lidongsjtu <li...@apache.org>
Authored: Fri Feb 9 13:55:27 2018 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Fri Feb 9 13:55:27 2018 +0800
----------------------------------------------------------------------
.../apache/kylin/rest/service/HybridService.java | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/d4f9d564/server-base/src/main/java/org/apache/kylin/rest/service/HybridService.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/HybridService.java b/server-base/src/main/java/org/apache/kylin/rest/service/HybridService.java
index eebc991..e714925 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/service/HybridService.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/service/HybridService.java
@@ -33,8 +33,8 @@ import org.apache.kylin.storage.hybrid.HybridInstance;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
import org.springframework.security.access.AccessDeniedException;
+import org.springframework.stereotype.Component;
@Component("hybridService")
public class HybridService extends BasicService {
@@ -44,7 +44,8 @@ public class HybridService extends BasicService {
@Autowired
private AclEvaluate aclEvaluate;
- public HybridInstance createHybridCube(String hybridName, String projectName, String modelName, String[] cubeNames) {
+ public HybridInstance createHybridCube(String hybridName, String projectName, String modelName,
+ String[] cubeNames) {
aclEvaluate.checkProjectWritePermission(projectName);
List<String> args = new ArrayList<String>();
args.add("-name");
@@ -66,7 +67,8 @@ public class HybridService extends BasicService {
return getHybridInstance(hybridName);
}
- public HybridInstance updateHybridCube(String hybridName, String projectName, String modelName, String[] cubeNames) {
+ public HybridInstance updateHybridCube(String hybridName, String projectName, String modelName,
+ String[] cubeNames) {
aclEvaluate.checkProjectWritePermission(projectName);
List<String> args = new ArrayList<String>();
args.add("-name");
@@ -132,7 +134,8 @@ public class HybridService extends BasicService {
}
}
for (ProjectInstance projectInstance : readableProjects) {
- List<RealizationEntry> realizationEntries = projectInstance.getRealizationEntries(RealizationType.HYBRID);
+ List<RealizationEntry> realizationEntries = projectInstance
+ .getRealizationEntries(RealizationType.HYBRID);
if (realizationEntries != null) {
for (RealizationEntry entry : realizationEntries) {
HybridInstance instance = getHybridManager().getHybridInstance(entry.getRealization());
@@ -155,8 +158,11 @@ public class HybridService extends BasicService {
if (StringUtils.isEmpty(modelName)) {
return allHybrids;
} else {
- DataModelDesc model = getMetadataManager().getDataModelDesc(modelName);
+ DataModelDesc model = getDataModelManager().getDataModelDesc(modelName);
List<HybridInstance> hybridsInModel = new ArrayList<HybridInstance>();
+ if (model == null)
+ return hybridsInModel;
+
for (HybridInstance hybridInstance : allHybrids) {
boolean hybridInModel = false;
for (RealizationEntry entry : hybridInstance.getRealizationEntries()) {