Repository: kylin Updated Branches: refs/heads/1.x-staging 430319316 -> ef4c524fc
KYLIN-1246 get cubes API update - offset,limit not required Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/ef4c524f Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/ef4c524f Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/ef4c524f Branch: refs/heads/1.x-staging Commit: ef4c524fc1e4168bb1ca6d4e6e4e6cec57e56763 Parents: 4303193 Author: jian <jiazh...@apache.org> Authored: Wed Dec 23 15:52:39 2015 +0800 Committer: jian <jiazh...@apache.org> Committed: Wed Dec 23 15:52:58 2015 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/rest/controller/CubeController.java | 4 ++-- .../main/java/org/apache/kylin/rest/service/CubeService.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/ef4c524f/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 95169da..679e4e6 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 @@ -93,8 +93,8 @@ public class CubeController extends BasicController { @RequestMapping(value = "", method = { RequestMethod.GET }) @ResponseBody - 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) { - return cubeService.getCubes(cubeName, projectName, (null == limit) ? 20 : limit, offset); + public List<CubeInstance> getCubes(@RequestParam(value = "cubeName", required = false) String cubeName, @RequestParam(value = "projectName", required = false) String projectName, @RequestParam(value = "limit", required = false) Integer limit, @RequestParam(value = "offset", required = false) Integer offset) { + return cubeService.getCubes(cubeName, projectName, limit, offset); } @RequestMapping(value = "/{cubeName}", method = { RequestMethod.GET }) http://git-wip-us.apache.org/repos/asf/kylin/blob/ef4c524f/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 af518ef..b8de4d4 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 @@ -110,12 +110,12 @@ public class CubeService extends BasicService { } public List<CubeInstance> getCubes(final String cubeName, final String projectName, final Integer limit, final Integer offset) { - int climit = (null == limit) ? 30 : limit; - int coffset = (null == offset) ? 0 : offset; - List<CubeInstance> cubes; cubes = listAllCubes(cubeName, projectName); + int coffset = (null == offset) ? 0 : offset; + int climit = (null == limit) ? cubes.size() : limit; + if (cubes.size() <= coffset) { return Collections.emptyList(); }
