You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/05/15 07:22:11 UTC
[42/52] [abbrv] incubator-kylin git commit: delete model
delete model
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/9f9d49d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/9f9d49d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/9f9d49d9
Branch: refs/heads/0.8.0
Commit: 9f9d49d9c5ea8b1b8a623b2571235ba1e06799b2
Parents: d60f726
Author: jiazhong <ji...@ebay.com>
Authored: Fri Apr 3 18:18:33 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Fri May 15 11:38:32 2015 +0800
----------------------------------------------------------------------
.../kylin/rest/controller/ModelController.java | 38 ++++++++------------
.../apache/kylin/rest/service/ModelService.java | 8 ++---
webapp/app/index.html | 2 +-
3 files changed, 18 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/9f9d49d9/server/src/main/java/org/apache/kylin/rest/controller/ModelController.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/controller/ModelController.java b/server/src/main/java/org/apache/kylin/rest/controller/ModelController.java
index ba45df1..290904d 100644
--- a/server/src/main/java/org/apache/kylin/rest/controller/ModelController.java
+++ b/server/src/main/java/org/apache/kylin/rest/controller/ModelController.java
@@ -70,13 +70,6 @@ public class ModelController extends BasicController {
}
}
- @RequestMapping(value = "/{modelName}", method = {RequestMethod.DELETE})
- @ResponseBody
- @Metered(name = "deleteModel")
- public void deleteModel(@PathVariable String modelName) {
-
- }
-
/**
*
* create model
@@ -140,22 +133,21 @@ public class ModelController extends BasicController {
return modelRequest;
}
-// @RequestMapping(value = "/{cubeName}", method = {RequestMethod.DELETE})
-// @ResponseBody
-// @Metered(name = "deleteCube")
-// public void deleteCube(@PathVariable String cubeName) {
-// CubeInstance cube = cubeService.getCubeManager().getCube(cubeName);
-// if (null == cube) {
-// throw new NotFoundException("Cube with name " + cubeName + " not found..");
-// }
-//
-// try {
-// cubeService.deleteCube(cube);
-// } catch (Exception e) {
-// logger.error(e.getLocalizedMessage(), e);
-// throw new InternalErrorException("Failed to delete cube. " + " Caused by: " + e.getMessage(), e);
-// }
-// }
+ @RequestMapping(value = "/{modelName}", method = {RequestMethod.DELETE})
+ @ResponseBody
+ @Metered(name = "deleteModel")
+ public void deleteModel(@PathVariable String modelName) {
+ DataModelDesc desc = modelService.getMetadataManager().getDataModelDesc(modelName);
+ if (null == desc) {
+ throw new NotFoundException("Data Model with name " + modelName + " not found..");
+ }
+ try {
+ modelService.deleteModel(desc);
+ } catch (Exception e) {
+ logger.error(e.getLocalizedMessage(), e);
+ throw new InternalErrorException("Failed to delete model. " + " Caused by: " + e.getMessage(), e);
+ }
+ }
private DataModelDesc deserializeDataModelDesc(ModelRequest modelRequest) {
DataModelDesc desc = null;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/9f9d49d9/server/src/main/java/org/apache/kylin/rest/service/ModelService.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/service/ModelService.java b/server/src/main/java/org/apache/kylin/rest/service/ModelService.java
index 3c349cc..2780f40 100644
--- a/server/src/main/java/org/apache/kylin/rest/service/ModelService.java
+++ b/server/src/main/java/org/apache/kylin/rest/service/ModelService.java
@@ -81,10 +81,6 @@ public class ModelService extends BasicService {
return modelDescs;
}
-// if (modelDescs.size() <= limit) {
-// return Collections.emptyList();
-// }
-
if ((modelDescs.size() - offset) < limit) {
return modelDescs.subList(offset, modelDescs.size());
}
@@ -116,8 +112,8 @@ public class ModelService extends BasicService {
}
- @PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN + " or hasPermission(#cube, 'ADMINISTRATION') or hasPermission(#desc, 'MANAGEMENT')")
- public void deleteCube(DataModelDesc desc) throws IOException {
+ @PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN + " or hasPermission(#desc, 'ADMINISTRATION') or hasPermission(#desc, 'MANAGEMENT')")
+ public void deleteModel(DataModelDesc desc) throws IOException {
// final List<CubingJob> cubingJobs = listAllCubingJobs(cube.getName(), null, EnumSet.of(ExecutableState.READY, ExecutableState.RUNNING));
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/9f9d49d9/webapp/app/index.html
----------------------------------------------------------------------
diff --git a/webapp/app/index.html b/webapp/app/index.html
index 8901721..19ced08 100644
--- a/webapp/app/index.html
+++ b/webapp/app/index.html
@@ -101,7 +101,7 @@
<script src="components/underscore/underscore.js"></script>
<script src="components/angular-underscore/angular-underscore.js"></script>
<script src="components/jquery-ui/jquery-ui.min.js"></script>
-<script src="components/angular-ui-sortable/sortable.min.js"></script>
+<script src="components/angular-ui-sortable/sortable.js"></script>
<script src="js/app.js"></script>
<script src="js/config.js"></script>