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 2015/02/12 06:43:05 UTC
[15/50] incubator-kylin git commit: Update unit tests
Update unit tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/a7b4ac81
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/a7b4ac81
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/a7b4ac81
Branch: refs/heads/inverted-index
Commit: a7b4ac81f05e664b56585a5e1db6cfb75dd13589
Parents: 7eb78db
Author: Shao Feng, Shi <sh...@ebay.com>
Authored: Tue Feb 10 17:38:56 2015 +0800
Committer: Shao Feng, Shi <sh...@ebay.com>
Committed: Tue Feb 10 17:38:56 2015 +0800
----------------------------------------------------------------------
.../kylin/rest/controller/CacheController.java | 13 ++-
.../kylin/rest/controller/CubeController.java | 115 +++++++++----------
.../kylin/rest/controller/ModelController.java | 6 +-
.../kylin/rest/controller/TableController.java | 46 ++++----
.../apache/kylin/rest/service/CubeService.java | 79 ++++++-------
.../rest/controller/CacheControllerTest.java | 57 +++++++++
.../rest/controller/CubeControllerTest.java | 47 ++++++--
.../rest/controller/TableControllerTest.java | 74 ++++++++++++
.../kylin/rest/service/ServiceTestBase.java | 22 ++--
9 files changed, 305 insertions(+), 154 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a7b4ac81/server/src/main/java/org/apache/kylin/rest/controller/CacheController.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/controller/CacheController.java b/server/src/main/java/org/apache/kylin/rest/controller/CacheController.java
index cb7f40f..42f5ad8 100644
--- a/server/src/main/java/org/apache/kylin/rest/controller/CacheController.java
+++ b/server/src/main/java/org/apache/kylin/rest/controller/CacheController.java
@@ -36,7 +36,6 @@ import java.io.IOException;
* CubeController is defined as Restful API entrance for UI.
*
* @author jianliu
- *
*/
@Controller
@RequestMapping(value = "/cache")
@@ -49,15 +48,13 @@ public class CacheController extends BasicController {
/**
* Wipe system cache
*
- * @param type
- * {@link Broadcaster.TYPE}
- * @param event
- * {@link Broadcaster.EVENT}
+ * @param type {@link Broadcaster.TYPE}
+ * @param event {@link Broadcaster.EVENT}
* @param name
* @return if the action success
* @throws IOException
*/
- @RequestMapping(value = "/{type}/{name}/{event}", method = { RequestMethod.PUT })
+ @RequestMapping(value = "/{type}/{name}/{event}", method = {RequestMethod.PUT})
@ResponseBody
public void wipeCache(@PathVariable String type, @PathVariable String event, @PathVariable String name) throws IOException {
Broadcaster.TYPE wipeType = Broadcaster.TYPE.getType(type);
@@ -76,4 +73,8 @@ public class CacheController extends BasicController {
throw new RuntimeException("invalid type:" + wipeEvent);
}
}
+
+ public void setCacheService(CacheService cacheService) {
+ this.cacheService = cacheService;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a7b4ac81/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java b/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java
index 1733a1a..e624d45 100644
--- a/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java
+++ b/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java
@@ -18,40 +18,11 @@
package org.apache.kylin.rest.controller;
-import java.io.IOException;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.kylin.rest.exception.BadRequestException;
-import org.apache.kylin.rest.exception.ForbiddenException;
-import org.apache.kylin.rest.exception.InternalErrorException;
-import org.apache.kylin.rest.request.JobBuildRequest;
-import org.apache.kylin.rest.response.GeneralResponse;
-import org.apache.kylin.rest.response.HBaseResponse;
-import org.apache.kylin.rest.service.CubeService;
-import org.quartz.SchedulerException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
import com.codahale.metrics.annotation.Metered;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonMappingException;
+import org.apache.commons.lang.StringUtils;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.util.JsonUtil;
import org.apache.kylin.cube.CubeInstance;
@@ -66,14 +37,33 @@ import org.apache.kylin.metadata.MetadataManager;
import org.apache.kylin.metadata.model.DataModelDesc;
import org.apache.kylin.metadata.model.SegmentStatusEnum;
import org.apache.kylin.metadata.project.ProjectInstance;
+import org.apache.kylin.rest.exception.BadRequestException;
+import org.apache.kylin.rest.exception.ForbiddenException;
+import org.apache.kylin.rest.exception.InternalErrorException;
import org.apache.kylin.rest.exception.NotFoundException;
import org.apache.kylin.rest.request.CubeRequest;
+import org.apache.kylin.rest.request.JobBuildRequest;
+import org.apache.kylin.rest.response.GeneralResponse;
+import org.apache.kylin.rest.response.HBaseResponse;
+import org.apache.kylin.rest.service.CubeService;
import org.apache.kylin.rest.service.JobService;
import org.apache.kylin.storage.hbase.coprocessor.observer.ObserverEnabler;
+import org.quartz.SchedulerException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.net.UnknownHostException;
+import java.util.*;
/**
* CubeController is defined as Restful API entrance for UI.
- *
+ *
* @author jianliu
*/
@Controller
@@ -87,7 +77,7 @@ public class CubeController extends BasicController {
@Autowired
private JobService jobService;
- @RequestMapping(value = "", method = { RequestMethod.GET })
+ @RequestMapping(value = "", method = {RequestMethod.GET})
@ResponseBody
@Metered(name = "listCubes")
public List<CubeInstance> getCubes(@RequestParam(value = "cubeName", required = false) String cubeName, @RequestParam(value = "projectName", required = false) String projectName, @RequestParam("limit") Integer limit, @RequestParam("offset") Integer offset) {
@@ -96,14 +86,13 @@ public class CubeController extends BasicController {
/**
* Get hive SQL of the cube
- *
- * @param cubeName
- * Cube Name
+ *
+ * @param cubeName Cube Name
* @return
* @throws UnknownHostException
* @throws IOException
*/
- @RequestMapping(value = "/{cubeName}/segs/{segmentName}/sql", method = { RequestMethod.GET })
+ @RequestMapping(value = "/{cubeName}/segs/{segmentName}/sql", method = {RequestMethod.GET})
@ResponseBody
public GeneralResponse getSql(@PathVariable String cubeName, @PathVariable String segmentName) {
CubeInstance cube = cubeService.getCubeManager().getCube(cubeName);
@@ -120,13 +109,13 @@ public class CubeController extends BasicController {
/**
* Update cube notify list
- *
+ *
* @param cubeName
* @param notifyList
* @throws IOException
* @throws CubeIntegrityException
*/
- @RequestMapping(value = "/{cubeName}/notify_list", method = { RequestMethod.PUT })
+ @RequestMapping(value = "/{cubeName}/notify_list", method = {RequestMethod.PUT})
@ResponseBody
public void updateNotifyList(@PathVariable String cubeName, @RequestBody List<String> notifyList) {
CubeInstance cube = cubeService.getCubeManager().getCube(cubeName);
@@ -144,7 +133,7 @@ public class CubeController extends BasicController {
}
- @RequestMapping(value = "/{cubeName}/cost", method = { RequestMethod.PUT })
+ @RequestMapping(value = "/{cubeName}/cost", method = {RequestMethod.PUT})
@ResponseBody
@Metered(name = "updateCubeCost")
public CubeInstance updateCubeCost(@PathVariable String cubeName, @RequestParam(value = "cost") int cost) {
@@ -157,7 +146,7 @@ public class CubeController extends BasicController {
}
}
- @RequestMapping(value = "/{cubeName}/coprocessor", method = { RequestMethod.PUT })
+ @RequestMapping(value = "/{cubeName}/coprocessor", method = {RequestMethod.PUT})
@ResponseBody
public Map<String, Boolean> updateCubeCoprocessor(@PathVariable String cubeName, @RequestParam(value = "force") String force) {
try {
@@ -172,10 +161,10 @@ public class CubeController extends BasicController {
/**
* Force rebuild a cube's lookup table snapshot
- *
+ *
* @throws IOException
*/
- @RequestMapping(value = "/{cubeName}/segs/{segmentName}/refresh_lookup", method = { RequestMethod.PUT })
+ @RequestMapping(value = "/{cubeName}/segs/{segmentName}/refresh_lookup", method = {RequestMethod.PUT})
@ResponseBody
public CubeInstance rebuildLookupSnapshot(@PathVariable String cubeName, @PathVariable String segmentName, @RequestParam(value = "lookupTable") String lookupTable) {
try {
@@ -188,14 +177,13 @@ public class CubeController extends BasicController {
/**
* Send a rebuild cube job
- *
- * @param cubeName
- * Cube ID
+ *
+ * @param cubeName Cube ID
* @return
* @throws SchedulerException
* @throws IOException
*/
- @RequestMapping(value = "/{cubeName}/rebuild", method = { RequestMethod.PUT })
+ @RequestMapping(value = "/{cubeName}/rebuild", method = {RequestMethod.PUT})
@ResponseBody
public JobInstance rebuild(@PathVariable String cubeName, @RequestBody JobBuildRequest jobBuildRequest) {
try {
@@ -212,7 +200,7 @@ public class CubeController extends BasicController {
}
}
- @RequestMapping(value = "/{cubeName}/disable", method = { RequestMethod.PUT })
+ @RequestMapping(value = "/{cubeName}/disable", method = {RequestMethod.PUT})
@ResponseBody
@Metered(name = "disableCube")
public CubeInstance disableCube(@PathVariable String cubeName) {
@@ -231,7 +219,7 @@ public class CubeController extends BasicController {
}
}
- @RequestMapping(value = "/{cubeName}/purge", method = { RequestMethod.PUT })
+ @RequestMapping(value = "/{cubeName}/purge", method = {RequestMethod.PUT})
@ResponseBody
@Metered(name = "purgeCube")
public CubeInstance purgeCube(@PathVariable String cubeName) {
@@ -250,7 +238,7 @@ public class CubeController extends BasicController {
}
}
- @RequestMapping(value = "/{cubeName}/enable", method = { RequestMethod.PUT })
+ @RequestMapping(value = "/{cubeName}/enable", method = {RequestMethod.PUT})
@ResponseBody
@Metered(name = "enableCube")
public CubeInstance enableCube(@PathVariable String cubeName) {
@@ -268,7 +256,7 @@ public class CubeController extends BasicController {
}
}
- @RequestMapping(value = "/{cubeName}", method = { RequestMethod.DELETE })
+ @RequestMapping(value = "/{cubeName}", method = {RequestMethod.DELETE})
@ResponseBody
@Metered(name = "deleteCube")
public void deleteCube(@PathVariable String cubeName) {
@@ -287,22 +275,29 @@ public class CubeController extends BasicController {
/**
* Get available table list of the input database
- *
+ *
* @return Table metadata array
* @throws IOException
*/
- @RequestMapping(value = "", method = { RequestMethod.POST })
+ @RequestMapping(value = "", method = {RequestMethod.POST})
@ResponseBody
@Metered(name = "saveCube")
public CubeRequest saveCubeDesc(@RequestBody CubeRequest cubeRequest) {
//Update Model
MetadataManager metaManager = MetadataManager.getInstance(KylinConfig.getInstanceFromEnv());
DataModelDesc modelDesc = deserializeDataModelDesc(cubeRequest);
- if (modelDesc == null) {
+ if (modelDesc == null || StringUtils.isEmpty(modelDesc.getName())) {
return cubeRequest;
}
+
try {
- metaManager.createDataModelDesc(modelDesc);
+ DataModelDesc existingModel = metaManager.getDataModelDesc(modelDesc.getName());
+ if (existingModel == null) {
+ metaManager.createDataModelDesc(modelDesc);
+ } else {
+ modelDesc.setLastModified(existingModel.getLastModified());
+ metaManager.updateDataModelDesc(modelDesc);
+ }
} catch (IOException e) {
// TODO Auto-generated catch block
logger.error("Failed to deal with the request:" + e.getLocalizedMessage(), e);
@@ -336,12 +331,12 @@ public class CubeController extends BasicController {
/**
* Get available table list of the input database
- *
+ *
* @return Table metadata array
- * @throws JsonProcessingException
+ * @throws JsonProcessingException
* @throws IOException
*/
- @RequestMapping(value = "", method = { RequestMethod.PUT })
+ @RequestMapping(value = "", method = {RequestMethod.PUT})
@ResponseBody
@Metered(name = "updateCube")
public CubeRequest updateCubeDesc(@RequestBody CubeRequest cubeRequest) throws JsonProcessingException {
@@ -400,11 +395,11 @@ public class CubeController extends BasicController {
/**
* Get available table list of the input database
- *
+ *
* @return true
* @throws IOException
*/
- @RequestMapping(value = "/{cubeName}/hbase", method = { RequestMethod.GET })
+ @RequestMapping(value = "/{cubeName}/hbase", method = {RequestMethod.GET})
@ResponseBody
@Metered(name = "getHBaseInfo")
public List<HBaseResponse> getHBaseInfo(@PathVariable String cubeName) {
@@ -481,7 +476,7 @@ public class CubeController extends BasicController {
*/
private String omitMessage(List<String> errors) {
StringBuffer buffer = new StringBuffer();
- for (Iterator<String> iterator = errors.iterator(); iterator.hasNext();) {
+ for (Iterator<String> iterator = errors.iterator(); iterator.hasNext(); ) {
String string = (String) iterator.next();
buffer.append(string);
buffer.append("\n");
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a7b4ac81/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 326fd53..2499f59 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
@@ -53,11 +53,15 @@ public class ModelController {
*/
@RequestMapping(value = "/{model_name}", method = { RequestMethod.GET })
@ResponseBody
- public DataModelDesc getCube(@PathVariable String model_name) {
+ public DataModelDesc getModel(@PathVariable String model_name) {
MetadataManager metaManager= MetadataManager.getInstance(KylinConfig.getInstanceFromEnv());
DataModelDesc modeDesc = metaManager.getDataModelDesc(model_name);
return modeDesc;
}
+ public void setCubeService(CubeService cubeService) {
+ this.cubeService = cubeService;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a7b4ac81/server/src/main/java/org/apache/kylin/rest/controller/TableController.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/controller/TableController.java b/server/src/main/java/org/apache/kylin/rest/controller/TableController.java
index 30f81b5..99b0875 100644
--- a/server/src/main/java/org/apache/kylin/rest/controller/TableController.java
+++ b/server/src/main/java/org/apache/kylin/rest/controller/TableController.java
@@ -18,35 +18,24 @@
package org.apache.kylin.rest.controller;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
+import com.codahale.metrics.annotation.Metered;
import org.apache.commons.lang.StringUtils;
+import org.apache.kylin.metadata.MetadataConstants;
+import org.apache.kylin.metadata.model.ColumnDesc;
+import org.apache.kylin.metadata.model.TableDesc;
import org.apache.kylin.rest.exception.InternalErrorException;
+import org.apache.kylin.rest.request.CardinalityRequest;
+import org.apache.kylin.rest.response.TableDescResponse;
import org.apache.kylin.rest.service.CubeService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
-import com.codahale.metrics.annotation.Metered;
-import org.apache.kylin.metadata.MetadataConstants;
-import org.apache.kylin.metadata.model.ColumnDesc;
-import org.apache.kylin.metadata.model.TableDesc;
-import org.apache.kylin.rest.request.CardinalityRequest;
-import org.apache.kylin.rest.response.TableDescResponse;
+import java.io.IOException;
+import java.util.*;
/**
* @author xduo
@@ -65,7 +54,7 @@ public class TableController extends BasicController {
* @return Table metadata array
* @throws IOException
*/
- @RequestMapping(value = "", method = { RequestMethod.GET })
+ @RequestMapping(value = "", method = {RequestMethod.GET})
@ResponseBody
@Metered(name = "listSourceTables")
public List<TableDesc> getHiveTables(@RequestParam(value = "ext", required = false) boolean withExt, @RequestParam(value = "project", required = false) String project) {
@@ -93,7 +82,7 @@ public class TableController extends BasicController {
* @return Table metadata array
* @throws IOException
*/
- @RequestMapping(value = "/{tableName}", method = { RequestMethod.GET })
+ @RequestMapping(value = "/{tableName}", method = {RequestMethod.GET})
@ResponseBody
public TableDesc getHiveTable(@PathVariable String tableName) {
return cubeMgmtService.getMetadataManager().getTableDesc(tableName);
@@ -105,21 +94,21 @@ public class TableController extends BasicController {
* @return Table metadata array
* @throws IOException
*/
- @RequestMapping(value = "/{tableName}/exd-map", method = { RequestMethod.GET })
+ @RequestMapping(value = "/{tableName}/exd-map", method = {RequestMethod.GET})
@ResponseBody
public Map<String, String> getHiveTableExd(@PathVariable String tableName) {
Map<String, String> tableExd = cubeMgmtService.getMetadataManager().getTableDescExd(tableName);
return tableExd;
}
- @RequestMapping(value = "/reload", method = { RequestMethod.PUT })
+ @RequestMapping(value = "/reload", method = {RequestMethod.PUT})
@ResponseBody
public String reloadSourceTable() {
cubeMgmtService.getMetadataManager().reload();
return "ok";
}
- @RequestMapping(value = "/{tables}/{project}", method = { RequestMethod.POST })
+ @RequestMapping(value = "/{tables}/{project}", method = {RequestMethod.POST})
@ResponseBody
public Map<String, String[]> loadHiveTable(@PathVariable String tables, @PathVariable String project) throws IOException {
String submitter = SecurityContextHolder.getContext().getAuthentication().getName();
@@ -138,7 +127,7 @@ public class TableController extends BasicController {
* @return Table metadata array
* @throws IOException
*/
- @RequestMapping(value = "/{tableNames}/cardinality", method = { RequestMethod.PUT })
+ @RequestMapping(value = "/{tableNames}/cardinality", method = {RequestMethod.PUT})
@ResponseBody
public CardinalityRequest generateCardinality(@PathVariable String tableNames, @RequestBody CardinalityRequest request) {
String submitter = SecurityContextHolder.getContext().getAuthentication().getName();
@@ -192,4 +181,9 @@ public class TableController extends BasicController {
}
return descs;
}
+
+ public void setCubeService(CubeService cubeService) {
+ this.cubeMgmtService = cubeService;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a7b4ac81/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 d9373ca..de97a7b 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
@@ -18,32 +18,8 @@
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;
-import java.util.EnumSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.client.HTable;
-import org.apache.kylin.rest.controller.QueryController;
-import org.apache.kylin.rest.exception.InternalErrorException;
-import org.apache.kylin.rest.response.MetricsResponse;
-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;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Component;
-
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.util.HBaseRegionSizeCalculator;
import org.apache.kylin.common.util.HadoopUtil;
@@ -70,9 +46,25 @@ import org.apache.kylin.metadata.realization.RealizationStatusEnum;
import org.apache.kylin.metadata.realization.RealizationType;
import org.apache.kylin.metadata.tool.HiveSourceTableLoader;
import org.apache.kylin.rest.constant.Constant;
+import org.apache.kylin.rest.controller.QueryController;
+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;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.net.UnknownHostException;
+import java.util.*;
/**
* Stateless & lightweight service facade of cube management functions.
@@ -156,10 +148,19 @@ public class CubeService extends BasicService {
CubeDesc createdDesc = null;
CubeInstance createdCube = null;
- createdDesc = getCubeDescManager().createCubeDesc(desc);
+ boolean isNew = false;
+ if (getCubeDescManager().getCubeDesc(desc.getName()) == null) {
+ createdDesc = getCubeDescManager().createCubeDesc(desc);
+ isNew = true;
+ } else {
+ createdDesc = getCubeDescManager().updateCubeDesc(desc);
+ }
+
if (!createdDesc.getError().isEmpty()) {
- getCubeDescManager().removeCubeDesc(createdDesc);
+ if (isNew) {
+ getCubeDescManager().removeCubeDesc(createdDesc);
+ }
throw new InternalErrorException(createdDesc.getError().get(0));
}
@@ -305,7 +306,7 @@ public class CubeService extends BasicService {
* @throws JobException
*/
@PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN + " or hasPermission(#cube, 'ADMINISTRATION') or hasPermission(#cube, 'OPERATION') or hasPermission(#cube, 'MANAGEMENT')")
- @Caching(evict = { @CacheEvict(value = QueryController.SUCCESS_QUERY_CACHE, allEntries = true), @CacheEvict(value = QueryController.EXCEPTION_QUERY_CACHE, allEntries = true) })
+ @Caching(evict = {@CacheEvict(value = QueryController.SUCCESS_QUERY_CACHE, allEntries = true), @CacheEvict(value = QueryController.EXCEPTION_QUERY_CACHE, allEntries = true)})
public CubeInstance purgeCube(CubeInstance cube) throws IOException, JobException {
String cubeName = cube.getName();
@@ -332,7 +333,7 @@ public class CubeService extends BasicService {
* @throws JobException
*/
@PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN + " or hasPermission(#cube, 'ADMINISTRATION') or hasPermission(#cube, 'OPERATION') or hasPermission(#cube, 'MANAGEMENT')")
- @Caching(evict = { @CacheEvict(value = QueryController.SUCCESS_QUERY_CACHE, allEntries = true), @CacheEvict(value = QueryController.EXCEPTION_QUERY_CACHE, allEntries = true) })
+ @Caching(evict = {@CacheEvict(value = QueryController.SUCCESS_QUERY_CACHE, allEntries = true), @CacheEvict(value = QueryController.EXCEPTION_QUERY_CACHE, allEntries = true)})
public CubeInstance disableCube(CubeInstance cube) throws IOException, JobException {
String cubeName = cube.getName();
@@ -471,27 +472,27 @@ public class CubeService extends BasicService {
logger.error("Cannot find table descirptor " + tableName, e);
throw e;
}
-
+
DefaultChainedExecutable job = new DefaultChainedExecutable();
job.setName("Hive Column Cardinality calculation for table '" + tableName + "'");
job.setSubmitter(submitter);
String outPath = HiveColumnCardinalityJob.OUTPUT_PATH + "/" + tableName;
String param = "-table " + tableName + " -output " + outPath;
-
+
HadoopShellExecutable step1 = new HadoopShellExecutable();
-
+
step1.setJobClass(HiveColumnCardinalityJob.class);
step1.setJobParams(param);
-
+
job.addTask(step1);
-
+
HadoopShellExecutable step2 = new HadoopShellExecutable();
-
+
step2.setJobClass(HiveColumnCardinalityUpdateJob.class);
step2.setJobParams(param);
job.addTask(step2);
-
+
getExecutableManager().addJob(job);
}
@@ -531,7 +532,7 @@ public class CubeService extends BasicService {
CubeManager.getInstance(getConfig()).updateCube(cube);
}
- @PreAuthorize(Constant.ACCESS_HAS_ROLE_MODELER)
+ @PreAuthorize(Constant.ACCESS_HAS_ROLE_MODELER + " or " + Constant.ACCESS_HAS_ROLE_ADMIN)
public String[] reloadHiveTable(String tables) throws IOException {
Set<String> loaded = HiveSourceTableLoader.reloadHiveTables(tables.split(","), getConfig());
return (String[]) loaded.toArray(new String[loaded.size()]);
@@ -541,9 +542,9 @@ public class CubeService extends BasicService {
public void syncTableToProject(String[] tables, String project) throws IOException {
getProjectManager().addTableDescToProject(tables, project);
}
-
- @PreAuthorize(Constant.ACCESS_HAS_ROLE_MODELER)
+
+ @PreAuthorize(Constant.ACCESS_HAS_ROLE_MODELER + " or " + Constant.ACCESS_HAS_ROLE_ADMIN)
public void calculateCardinalityIfNotPresent(String[] tables, String submitter) throws IOException {
MetadataManager metaMgr = getMetadataManager();
for (String table : tables) {
@@ -554,5 +555,5 @@ public class CubeService extends BasicService {
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a7b4ac81/server/src/test/java/org/apache/kylin/rest/controller/CacheControllerTest.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/kylin/rest/controller/CacheControllerTest.java b/server/src/test/java/org/apache/kylin/rest/controller/CacheControllerTest.java
new file mode 100644
index 0000000..d75c5ca
--- /dev/null
+++ b/server/src/test/java/org/apache/kylin/rest/controller/CacheControllerTest.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+package org.apache.kylin.rest.controller;
+
+import org.apache.kylin.metadata.model.TableDesc;
+import org.apache.kylin.rest.service.CacheService;
+import org.apache.kylin.rest.service.CubeService;
+import org.apache.kylin.rest.service.ServiceTestBase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author shaoshi
+ */
+public class CacheControllerTest extends ServiceTestBase {
+
+ private CacheController cacheController;
+
+ @Autowired
+ private CacheService cacheService;
+
+ @Before
+ public void setup() throws Exception {
+ super.setUp();
+
+ cacheController = new CacheController();
+ cacheController.setCacheService(cacheService);
+ }
+
+ @Test
+ public void testBasics() throws IOException {
+
+ cacheController.wipeCache("cube_desc", "drop", "test_kylin_cube_with_slr_desc");
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a7b4ac81/server/src/test/java/org/apache/kylin/rest/controller/CubeControllerTest.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/kylin/rest/controller/CubeControllerTest.java b/server/src/test/java/org/apache/kylin/rest/controller/CubeControllerTest.java
index 52247d3..ee57cd3 100644
--- a/server/src/test/java/org/apache/kylin/rest/controller/CubeControllerTest.java
+++ b/server/src/test/java/org/apache/kylin/rest/controller/CubeControllerTest.java
@@ -18,20 +18,23 @@
package org.apache.kylin.rest.controller;
-import java.io.IOException;
-import java.io.StringWriter;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.Lists;
+import org.apache.kylin.cube.CubeInstance;
import org.apache.kylin.cube.model.CubeDesc;
+import org.apache.kylin.metadata.model.DataModelDesc;
import org.apache.kylin.rest.request.CubeRequest;
import org.apache.kylin.rest.service.CubeService;
import org.apache.kylin.rest.service.JobService;
import org.apache.kylin.rest.service.ServiceTestBase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.List;
/**
* @author xduo
@@ -40,6 +43,7 @@ public class CubeControllerTest extends ServiceTestBase {
private CubeController cubeController;
private CubeDescController cubeDescController;
+ private ModelController modelController;
@Autowired
CubeService cubeService;
@@ -55,6 +59,9 @@ public class CubeControllerTest extends ServiceTestBase {
cubeController.setJobService(jobService);
cubeDescController = new CubeDescController();
cubeDescController.setCubeService(cubeService);
+
+ modelController = new ModelController();
+ modelController.setCubeService(cubeService);
}
@Test
@@ -67,6 +74,13 @@ public class CubeControllerTest extends ServiceTestBase {
CubeDesc cube = cubes[0];
CubeDesc newCube = new CubeDesc();
String newCubeName = cube.getName() + "_test_save";
+
+ try {
+ cubeController.deleteCube(newCubeName);
+ } catch (Exception e) {
+ // it may not exist, ignore the exception
+ }
+
newCube.setName(newCubeName);
newCube.setModelName(cube.getModelName());
newCube.setModel(cube.getModel());
@@ -76,7 +90,8 @@ public class CubeControllerTest extends ServiceTestBase {
newCube.setConfig(cube.getConfig());
newCube.setRowkey(cube.getRowkey());
- newCube.getModel().setName(newCubeName + "_model_desc" + System.currentTimeMillis());//generate a random model
+ String newModelName = newCubeName + "_model_desc";
+ newCube.getModel().setName(newModelName);//generate a random model
newCube.getModel().setLastModified(0);
ObjectMapper cubeDescMapper = new ObjectMapper();
@@ -92,6 +107,20 @@ public class CubeControllerTest extends ServiceTestBase {
cubeRequest.setModelDescData(modelDescWriter.toString());
cubeRequest = cubeController.saveCubeDesc(cubeRequest);
+
+ DataModelDesc model = modelController.getModel(newModelName);
+ Assert.assertNotNull(model);
+
+ List<String> notifyList = Lists.newArrayList();
+ notifyList.add("john@example.com");
+ cubeController.updateNotifyList(newCubeName, notifyList);
+ cubeController.updateCubeCost(newCubeName, 80);
+
+ List<CubeInstance> cubeInstances = cubeController.getCubes(newCubeName, "default", 1, 0);
+
+ CubeInstance cubeInstance = cubeInstances.get(0);
+ Assert.assertTrue(cubeInstance.getDescriptor().getNotifyList().contains("john@example.com"));
+ Assert.assertTrue(cubeInstance.getCost() == 80);
cubeController.deleteCube(newCubeName);
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a7b4ac81/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
new file mode 100644
index 0000000..37e184f
--- /dev/null
+++ b/server/src/test/java/org/apache/kylin/rest/controller/TableControllerTest.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+package org.apache.kylin.rest.controller;
+
+import org.apache.kylin.metadata.model.TableDesc;
+import org.apache.kylin.rest.service.CubeService;
+import org.apache.kylin.rest.service.ServiceTestBase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author shaoshi
+ */
+public class TableControllerTest extends ServiceTestBase {
+
+ private TableController tableController;
+ private CubeDescController cubeDescController;
+
+ @Autowired
+ CubeService cubeService;
+
+ @Before
+ public void setup() throws Exception {
+ super.setUp();
+
+ tableController = new TableController();
+ tableController.setCubeService(cubeService);
+ }
+
+ @Test
+ public void testBasics() throws IOException {
+ List<TableDesc> tables = tableController.getHiveTables(true, "default");
+
+ Assert.assertTrue(tables != null && tables.size() > 0);
+
+ TableDesc factTable = null;
+ for (TableDesc t : tables) {
+ if (t.getName().equalsIgnoreCase("test_kylin_fact")) {
+ factTable = t;
+ break;
+ }
+ }
+
+ Assert.assertNotNull(factTable);
+
+
+ Map<String, String[]> loadResult = tableController.loadHiveTable("test_kylin_fact,TEST_CATEGORY_GROUPINGS", "default");
+ Assert.assertNotNull(loadResult);
+
+ Assert.assertTrue(loadResult.get("result.loaded").length ==2);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a7b4ac81/server/src/test/java/org/apache/kylin/rest/service/ServiceTestBase.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/kylin/rest/service/ServiceTestBase.java b/server/src/test/java/org/apache/kylin/rest/service/ServiceTestBase.java
index 3b923ad..5f98767 100644
--- a/server/src/test/java/org/apache/kylin/rest/service/ServiceTestBase.java
+++ b/server/src/test/java/org/apache/kylin/rest/service/ServiceTestBase.java
@@ -18,11 +18,13 @@
package org.apache.kylin.rest.service;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.kylin.common.util.HBaseMetadataTestCase;
+import org.apache.kylin.cube.CubeManager;
+import org.apache.kylin.dict.DictionaryManager;
+import org.apache.kylin.invertedindex.IIManager;
+import org.apache.kylin.metadata.MetadataManager;
+import org.apache.kylin.metadata.project.ProjectManager;
+import org.junit.*;
import org.junit.runner.RunWith;
import org.springframework.security.authentication.TestingAuthenticationToken;
import org.springframework.security.core.Authentication;
@@ -30,20 +32,14 @@ import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.apache.kylin.common.util.HBaseMetadataTestCase;
-import org.apache.kylin.cube.CubeManager;
-import org.apache.kylin.dict.DictionaryManager;
-import org.apache.kylin.invertedindex.IIManager;
-import org.apache.kylin.metadata.MetadataManager;
-import org.apache.kylin.metadata.project.ProjectManager;
/**
* @author xduo
*/
@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = { "classpath:applicationContext.xml", "classpath:kylinSecurity.xml" })
+@ContextConfiguration(locations = {"classpath:applicationContext.xml", "classpath:kylinSecurity.xml"})
@ActiveProfiles("testing")
-public class ServiceTestBase extends HBaseMetadataTestCase { //HBaseMetadataTestCase {
+public class ServiceTestBase extends HBaseMetadataTestCase {
@BeforeClass
public static void setupResource() throws Exception {