You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2017/12/08 10:57:38 UTC
[5/5] kylin git commit: KYLIN-2953 List readable project not correct
if add limit and offset
KYLIN-2953 List readable project not correct if add limit and offset
Signed-off-by: shaofengshi <sh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/24f7e626
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/24f7e626
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/24f7e626
Branch: refs/heads/master
Commit: 24f7e626e39a93d14aaf6a9783853176790a9f84
Parents: 6b39397
Author: liapan <li...@ebay.com>
Authored: Fri Dec 8 10:48:32 2017 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Fri Dec 8 18:57:29 2017 +0800
----------------------------------------------------------------------
.../kylin/rest/controller/ProjectController.java | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/24f7e626/server-base/src/main/java/org/apache/kylin/rest/controller/ProjectController.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/ProjectController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/ProjectController.java
index 4bb8e82..21cd9cd 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/controller/ProjectController.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/controller/ProjectController.java
@@ -20,6 +20,7 @@ package org.apache.kylin.rest.controller;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import org.apache.commons.lang.StringUtils;
@@ -88,7 +89,7 @@ public class ProjectController extends BasicController {
List<ProjectInstance> readableProjects = new ArrayList<ProjectInstance>();
//list all projects first
- List<ProjectInstance> projectInstances = projectService.listAllProjects(limit, offset);
+ List<ProjectInstance> projectInstances = projectService.listAllProjects(null, null);
for (ProjectInstance projectInstance : projectInstances) {
@@ -108,7 +109,18 @@ public class ProjectController extends BasicController {
}
}
- return readableProjects;
+ int projectLimit = (null == limit) ? Integer.MAX_VALUE : limit;
+ int projectOffset = (null == offset) ? 0 : offset;
+
+ if (readableProjects.size() <= projectOffset) {
+ return Collections.emptyList();
+ }
+
+ if ((readableProjects.size() - projectOffset) < projectLimit) {
+ return readableProjects.subList(projectOffset, readableProjects.size());
+ }
+
+ return readableProjects.subList(projectOffset, projectOffset + projectLimit);
}
@RequestMapping(value = "", method = { RequestMethod.POST }, produces = { "application/json" })