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/06/29 05:48:09 UTC
[02/50] kylin git commit: KYLIN-2632 update get saved queries api
(#1172)
KYLIN-2632 update get saved queries api (#1172)
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/3dbdbf54
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/3dbdbf54
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/3dbdbf54
Branch: refs/heads/master
Commit: 3dbdbf544be012b47d4735a3f5aae0254e97b153
Parents: b172e0c
Author: Luwei-Chen <ch...@apache.org>
Authored: Thu Jun 15 12:22:28 2017 +0800
Committer: luguosheng1314 <55...@qq.com>
Committed: Thu Jun 15 12:22:28 2017 +0800
----------------------------------------------------------------------
.../org/apache/kylin/rest/controller2/QueryControllerV2.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/3dbdbf54/server-base/src/main/java/org/apache/kylin/rest/controller2/QueryControllerV2.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller2/QueryControllerV2.java b/server-base/src/main/java/org/apache/kylin/rest/controller2/QueryControllerV2.java
index ab4741d..a641a53 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/controller2/QueryControllerV2.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/controller2/QueryControllerV2.java
@@ -109,10 +109,10 @@ public class QueryControllerV2 extends BasicController {
queryService.removeQuery(creator, id);
}
- @RequestMapping(value = "/saved_queries/{project}", method = RequestMethod.GET, produces = {
+ @RequestMapping(value = "/saved_queries", method = RequestMethod.GET, produces = {
"application/vnd.apache.kylin-v2+json" })
@ResponseBody
- public EnvelopeResponse getQueriesV2(@PathVariable String project,
+ public EnvelopeResponse getQueriesV2(@RequestParam(value = "project", required = false) String project,
@RequestParam(value = "pageOffset", required = false, defaultValue = "0") Integer pageOffset,
@RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize)
throws IOException {
@@ -121,7 +121,7 @@ public class QueryControllerV2 extends BasicController {
String creator = SecurityContextHolder.getContext().getAuthentication().getName();
List<Query> queries = new ArrayList<Query>();
for (Query query : queryService.getQueries(creator)) {
- if (query.getProject().equals(project))
+ if (project == null || query.getProject().equals(project))
queries.add(query);
}