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 2017/09/01 02:55:17 UTC
[41/50] [abbrv] kylin git commit: minor change getProject() in
DataModelDesc
minor change getProject() in DataModelDesc
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/28ac7d9a
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/28ac7d9a
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/28ac7d9a
Branch: refs/heads/master
Commit: 28ac7d9aeeeb8818207a363231b1354652f9aa8d
Parents: 487a854
Author: tttMelody <24...@qq.com>
Authored: Tue Aug 29 17:22:41 2017 +0800
Committer: Hongbin Ma <ma...@kyligence.io>
Committed: Tue Aug 29 17:40:33 2017 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/metadata/model/DataModelDesc.java | 4 ++--
.../org/apache/kylin/rest/controller/ModelController.java | 2 +-
.../java/org/apache/kylin/rest/service/ModelService.java | 8 ++++----
.../java/org/apache/kylin/rest/service/ModelServiceTest.java | 8 ++++----
4 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/28ac7d9a/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java
index a5da833..b27d644 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java
@@ -854,11 +854,11 @@ public class DataModelDesc extends RootPersistentEntity {
}
public String getProject() {
- return ProjectManager.getInstance(KylinConfig.getInstanceFromEnv()).getProjectOfModel(this.getName()).getName();
+ return ProjectManager.getInstance(getConfig()).getProjectOfModel(this.getName()).getName();
}
public ProjectInstance getProjectInstance() {
- return ProjectManager.getInstance(KylinConfig.getInstanceFromEnv()).getProjectOfModel(this.getName());
+ return ProjectManager.getInstance(getConfig()).getProjectOfModel(this.getName());
}
public static DataModelDesc getCopyOf(DataModelDesc orig) {
http://git-wip-us.apache.org/repos/asf/kylin/blob/28ac7d9a/server-base/src/main/java/org/apache/kylin/rest/controller/ModelController.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/ModelController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/ModelController.java
index 4226e87..c5bee9f 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/controller/ModelController.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/controller/ModelController.java
@@ -131,7 +131,7 @@ public class ModelController extends BasicController {
return modelRequest;
}
try {
- modelDesc = modelService.updateModelAndDesc(modelDesc);
+ modelDesc = modelService.updateModelAndDesc(modelRequest.getProject(), modelDesc);
} catch (AccessDeniedException accessDeniedException) {
throw new ForbiddenException("You don't have right to update this model.");
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/kylin/blob/28ac7d9a/server-base/src/main/java/org/apache/kylin/rest/service/ModelService.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/ModelService.java b/server-base/src/main/java/org/apache/kylin/rest/service/ModelService.java
index 82632eb..42cf085 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/service/ModelService.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/service/ModelService.java
@@ -143,8 +143,8 @@ public class ModelService extends BasicService {
return createdDesc;
}
- public DataModelDesc updateModelAndDesc(DataModelDesc desc) throws IOException {
- aclEvaluate.hasProjectWritePermission(desc.getProjectInstance());
+ public DataModelDesc updateModelAndDesc(String project, DataModelDesc desc) throws IOException {
+ aclEvaluate.checkProjectWritePermission(project);
getMetadataManager().updateDataModelDesc(desc);
return desc;
}
@@ -428,7 +428,7 @@ public class ModelService extends BasicService {
}
public DataModelDesc updateModelToResourceStore(DataModelDesc modelDesc, String projectName) throws IOException {
- aclEvaluate.hasProjectWritePermission(getProjectManager().getProject(projectName));
+ aclEvaluate.checkProjectWritePermission(projectName);
Message msg = MsgPicker.getMsg();
modelDesc.setDraft(false);
@@ -445,7 +445,7 @@ public class ModelService extends BasicService {
if (!error.isEmpty()) {
throw new BadRequestException(error);
}
- modelDesc = updateModelAndDesc(modelDesc);
+ modelDesc = updateModelAndDesc(projectName, modelDesc);
}
} catch (AccessDeniedException accessDeniedException) {
throw new ForbiddenException(msg.getUPDATE_MODEL_NO_RIGHT());
http://git-wip-us.apache.org/repos/asf/kylin/blob/28ac7d9a/server/src/test/java/org/apache/kylin/rest/service/ModelServiceTest.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/kylin/rest/service/ModelServiceTest.java b/server/src/test/java/org/apache/kylin/rest/service/ModelServiceTest.java
index b51d90c..fb44b6c 100644
--- a/server/src/test/java/org/apache/kylin/rest/service/ModelServiceTest.java
+++ b/server/src/test/java/org/apache/kylin/rest/service/ModelServiceTest.java
@@ -58,7 +58,7 @@ public class ModelServiceTest extends ServiceTestBase {
DataModelDesc deserialize = MetadataManager.MODELDESC_SERIALIZER.deserialize(new DataInputStream(bais));
deserialize.setOwner("somebody");
- DataModelDesc dataModelDesc = modelService.updateModelAndDesc(deserialize);
+ DataModelDesc dataModelDesc = modelService.updateModelAndDesc("default", deserialize);
Assert.assertTrue(dataModelDesc.getOwner().equals("somebody"));
}
@@ -77,7 +77,7 @@ public class ModelServiceTest extends ServiceTestBase {
Field field = ComputedColumnDesc.class.getDeclaredField("comment");
field.setAccessible(true);
field.set(deserialize.getComputedColumnDescs().get(0), "change on comment is okay");
- DataModelDesc dataModelDesc = modelService.updateModelAndDesc(deserialize);
+ DataModelDesc dataModelDesc = modelService.updateModelAndDesc("default", deserialize);
}
@Test
@@ -98,7 +98,7 @@ public class ModelServiceTest extends ServiceTestBase {
Field field = ComputedColumnDesc.class.getDeclaredField("expression");
field.setAccessible(true);
field.set(deserialize.getComputedColumnDescs().get(0), "another expression");
- DataModelDesc dataModelDesc = modelService.updateModelAndDesc(deserialize);
+ DataModelDesc dataModelDesc = modelService.updateModelAndDesc("default", deserialize);
}
@Test
@@ -119,7 +119,7 @@ public class ModelServiceTest extends ServiceTestBase {
Field field = ComputedColumnDesc.class.getDeclaredField("columnName");
field.setAccessible(true);
field.set(deserialize.getComputedColumnDescs().get(0), "cal_dt");
- DataModelDesc dataModelDesc = modelService.updateModelAndDesc(deserialize);
+ DataModelDesc dataModelDesc = modelService.updateModelAndDesc("default", deserialize);
}
@Test