[06/50] [abbrv] kylin git commit: minor, mv method from query controller to service

2016-10-20 Thread liyang 
minor, mv method from query controller to service

Signed-off-by: Li Yang 


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/44cf9fba
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/44cf9fba
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/44cf9fba

Branch: refs/heads/KYLIN-1971
Commit: 44cf9fba5900252fb3b4364d4bd129d83212d51c
Parents: ef44b7f
Author: Roger Shi 
Authored: Mon Oct 17 13:21:37 2016 +0800
Committer: Li Yang 
Committed: Mon Oct 17 13:33:08 2016 +0800

--
 .../kylin/rest/controller/QueryController.java  | 136 +--
 .../apache/kylin/rest/service/CacheService.java |   5 +-
 .../apache/kylin/rest/service/QueryService.java | 132 +-
 .../rest/controller/QueryControllerTest.java|   2 +-
 4 files changed, 134 insertions(+), 141 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/44cf9fba/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
--
diff --git 
a/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
 
b/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
index 9471937..c5f896d 100644
--- 
a/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
+++ 
b/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
@@ -23,15 +23,10 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.kylin.common.KylinConfig;
-import org.apache.kylin.common.debug.BackdoorToggles;
-import org.apache.kylin.rest.constant.Constant;
 import org.apache.kylin.rest.exception.InternalErrorException;
-import org.apache.kylin.rest.metrics.QueryMetricsFacade;
 import org.apache.kylin.rest.model.Query;
 import org.apache.kylin.rest.model.SelectedColumnMeta;
 import org.apache.kylin.rest.model.TableMeta;
@@ -41,12 +36,9 @@ import org.apache.kylin.rest.request.SQLRequest;
 import org.apache.kylin.rest.request.SaveSqlRequest;
 import org.apache.kylin.rest.response.SQLResponse;
 import org.apache.kylin.rest.service.QueryService;
-import org.apache.kylin.rest.util.QueryUtil;
-import org.apache.kylin.storage.exception.ScanOutOfLimitException;
 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;
@@ -58,12 +50,6 @@ import org.supercsv.io.CsvListWriter;
 import org.supercsv.io.ICsvListWriter;
 import org.supercsv.prefs.CsvPreference;
 
-import com.google.common.base.Preconditions;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.Element;
-
 /**
  * Handle query requests.
  * 
@@ -74,31 +60,20 @@ public class QueryController extends BasicController {
 
 private static final Logger logger = 
LoggerFactory.getLogger(QueryController.class);
 
-public static final String SUCCESS_QUERY_CACHE = "StorageCache";
-public static final String EXCEPTION_QUERY_CACHE = "ExceptionQueryCache";
-
 @Autowired
 private QueryService queryService;
 
-@Autowired
-private CacheManager cacheManager;
-
-@PostConstruct
-public void init() throws IOException {
-Preconditions.checkNotNull(cacheManager, "cacheManager is not injected 
yet");
-}
-
 @RequestMapping(value = "/query", method = RequestMethod.POST)
 @ResponseBody
 public SQLResponse query(@RequestBody SQLRequest sqlRequest) {
-return doQueryWithCache(sqlRequest);
+return queryService.doQueryWithCache(sqlRequest);
 }
 
 // TODO should be just "prepare" a statement, get back expected 
ResultSetMetaData
 @RequestMapping(value = "/query/prestate", method = RequestMethod.POST, 
produces = "application/json")
 @ResponseBody
 public SQLResponse prepareQuery(@RequestBody PrepareSqlRequest sqlRequest) 
{
-return doQueryWithCache(sqlRequest);
+return queryService.doQueryWithCache(sqlRequest);
 }
 
 @RequestMapping(value = "/saved_queries", method = RequestMethod.POST)
@@ -127,7 +102,7 @@ public class QueryController extends BasicController {
 @RequestMapping(value = "/query/format/{format}", method = 
RequestMethod.GET)
 @ResponseBody
 public void downloadQueryResult(@PathVariable String format, SQLRequest 
sqlRequest, HttpServletResponse response) {
-SQLResponse result = doQueryW

[32/50] [abbrv] kylin git commit: minor, mv method from query controller to service

2016-10-18 Thread lidong 
minor, mv method from query controller to service

Signed-off-by: Li Yang 


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/44cf9fba
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/44cf9fba
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/44cf9fba

Branch: refs/heads/master-cdh5.7
Commit: 44cf9fba5900252fb3b4364d4bd129d83212d51c
Parents: ef44b7f
Author: Roger Shi 
Authored: Mon Oct 17 13:21:37 2016 +0800
Committer: Li Yang 
Committed: Mon Oct 17 13:33:08 2016 +0800

--
 .../kylin/rest/controller/QueryController.java  | 136 +--
 .../apache/kylin/rest/service/CacheService.java |   5 +-
 .../apache/kylin/rest/service/QueryService.java | 132 +-
 .../rest/controller/QueryControllerTest.java|   2 +-
 4 files changed, 134 insertions(+), 141 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/44cf9fba/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
--
diff --git 
a/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
 
b/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
index 9471937..c5f896d 100644
--- 
a/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
+++ 
b/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
@@ -23,15 +23,10 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.kylin.common.KylinConfig;
-import org.apache.kylin.common.debug.BackdoorToggles;
-import org.apache.kylin.rest.constant.Constant;
 import org.apache.kylin.rest.exception.InternalErrorException;
-import org.apache.kylin.rest.metrics.QueryMetricsFacade;
 import org.apache.kylin.rest.model.Query;
 import org.apache.kylin.rest.model.SelectedColumnMeta;
 import org.apache.kylin.rest.model.TableMeta;
@@ -41,12 +36,9 @@ import org.apache.kylin.rest.request.SQLRequest;
 import org.apache.kylin.rest.request.SaveSqlRequest;
 import org.apache.kylin.rest.response.SQLResponse;
 import org.apache.kylin.rest.service.QueryService;
-import org.apache.kylin.rest.util.QueryUtil;
-import org.apache.kylin.storage.exception.ScanOutOfLimitException;
 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;
@@ -58,12 +50,6 @@ import org.supercsv.io.CsvListWriter;
 import org.supercsv.io.ICsvListWriter;
 import org.supercsv.prefs.CsvPreference;
 
-import com.google.common.base.Preconditions;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.Element;
-
 /**
  * Handle query requests.
  * 
@@ -74,31 +60,20 @@ public class QueryController extends BasicController {
 
 private static final Logger logger = 
LoggerFactory.getLogger(QueryController.class);
 
-public static final String SUCCESS_QUERY_CACHE = "StorageCache";
-public static final String EXCEPTION_QUERY_CACHE = "ExceptionQueryCache";
-
 @Autowired
 private QueryService queryService;
 
-@Autowired
-private CacheManager cacheManager;
-
-@PostConstruct
-public void init() throws IOException {
-Preconditions.checkNotNull(cacheManager, "cacheManager is not injected 
yet");
-}
-
 @RequestMapping(value = "/query", method = RequestMethod.POST)
 @ResponseBody
 public SQLResponse query(@RequestBody SQLRequest sqlRequest) {
-return doQueryWithCache(sqlRequest);
+return queryService.doQueryWithCache(sqlRequest);
 }
 
 // TODO should be just "prepare" a statement, get back expected 
ResultSetMetaData
 @RequestMapping(value = "/query/prestate", method = RequestMethod.POST, 
produces = "application/json")
 @ResponseBody
 public SQLResponse prepareQuery(@RequestBody PrepareSqlRequest sqlRequest) 
{
-return doQueryWithCache(sqlRequest);
+return queryService.doQueryWithCache(sqlRequest);
 }
 
 @RequestMapping(value = "/saved_queries", method = RequestMethod.POST)
@@ -127,7 +102,7 @@ public class QueryController extends BasicController {
 @RequestMapping(value = "/query/format/{format}", method = 
RequestMethod.GET)
 @ResponseBody
 public void downloadQueryResult(@PathVariable String format, SQLRequest 
sqlRequest, HttpServletResponse response) {
-SQLResponse result = doQue

[33/50] [abbrv] kylin git commit: minor, mv method from query controller to service

2016-10-18 Thread lidong 
minor, mv method from query controller to service

Signed-off-by: Li Yang 


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/44cf9fba
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/44cf9fba
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/44cf9fba

Branch: refs/heads/master-hbase1.x
Commit: 44cf9fba5900252fb3b4364d4bd129d83212d51c
Parents: ef44b7f
Author: Roger Shi 
Authored: Mon Oct 17 13:21:37 2016 +0800
Committer: Li Yang 
Committed: Mon Oct 17 13:33:08 2016 +0800

--
 .../kylin/rest/controller/QueryController.java  | 136 +--
 .../apache/kylin/rest/service/CacheService.java |   5 +-
 .../apache/kylin/rest/service/QueryService.java | 132 +-
 .../rest/controller/QueryControllerTest.java|   2 +-
 4 files changed, 134 insertions(+), 141 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/44cf9fba/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
--
diff --git 
a/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
 
b/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
index 9471937..c5f896d 100644
--- 
a/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
+++ 
b/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
@@ -23,15 +23,10 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.kylin.common.KylinConfig;
-import org.apache.kylin.common.debug.BackdoorToggles;
-import org.apache.kylin.rest.constant.Constant;
 import org.apache.kylin.rest.exception.InternalErrorException;
-import org.apache.kylin.rest.metrics.QueryMetricsFacade;
 import org.apache.kylin.rest.model.Query;
 import org.apache.kylin.rest.model.SelectedColumnMeta;
 import org.apache.kylin.rest.model.TableMeta;
@@ -41,12 +36,9 @@ import org.apache.kylin.rest.request.SQLRequest;
 import org.apache.kylin.rest.request.SaveSqlRequest;
 import org.apache.kylin.rest.response.SQLResponse;
 import org.apache.kylin.rest.service.QueryService;
-import org.apache.kylin.rest.util.QueryUtil;
-import org.apache.kylin.storage.exception.ScanOutOfLimitException;
 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;
@@ -58,12 +50,6 @@ import org.supercsv.io.CsvListWriter;
 import org.supercsv.io.ICsvListWriter;
 import org.supercsv.prefs.CsvPreference;
 
-import com.google.common.base.Preconditions;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.Element;
-
 /**
  * Handle query requests.
  * 
@@ -74,31 +60,20 @@ public class QueryController extends BasicController {
 
 private static final Logger logger = 
LoggerFactory.getLogger(QueryController.class);
 
-public static final String SUCCESS_QUERY_CACHE = "StorageCache";
-public static final String EXCEPTION_QUERY_CACHE = "ExceptionQueryCache";
-
 @Autowired
 private QueryService queryService;
 
-@Autowired
-private CacheManager cacheManager;
-
-@PostConstruct
-public void init() throws IOException {
-Preconditions.checkNotNull(cacheManager, "cacheManager is not injected 
yet");
-}
-
 @RequestMapping(value = "/query", method = RequestMethod.POST)
 @ResponseBody
 public SQLResponse query(@RequestBody SQLRequest sqlRequest) {
-return doQueryWithCache(sqlRequest);
+return queryService.doQueryWithCache(sqlRequest);
 }
 
 // TODO should be just "prepare" a statement, get back expected 
ResultSetMetaData
 @RequestMapping(value = "/query/prestate", method = RequestMethod.POST, 
produces = "application/json")
 @ResponseBody
 public SQLResponse prepareQuery(@RequestBody PrepareSqlRequest sqlRequest) 
{
-return doQueryWithCache(sqlRequest);
+return queryService.doQueryWithCache(sqlRequest);
 }
 
 @RequestMapping(value = "/saved_queries", method = RequestMethod.POST)
@@ -127,7 +102,7 @@ public class QueryController extends BasicController {
 @RequestMapping(value = "/query/format/{format}", method = 
RequestMethod.GET)
 @ResponseBody
 public void downloadQueryResult(@PathVariable String format, SQLRequest 
sqlRequest, HttpServletResponse response) {
-SQLResponse result = doQ

kylin git commit: minor, mv method from query controller to service

2016-10-16 Thread liyang 
Repository: kylin
Updated Branches:
  refs/heads/master ef44b7f68 -> 44cf9fba5


minor, mv method from query controller to service

Signed-off-by: Li Yang 


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/44cf9fba
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/44cf9fba
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/44cf9fba

Branch: refs/heads/master
Commit: 44cf9fba5900252fb3b4364d4bd129d83212d51c
Parents: ef44b7f
Author: Roger Shi 
Authored: Mon Oct 17 13:21:37 2016 +0800
Committer: Li Yang 
Committed: Mon Oct 17 13:33:08 2016 +0800

--
 .../kylin/rest/controller/QueryController.java  | 136 +--
 .../apache/kylin/rest/service/CacheService.java |   5 +-
 .../apache/kylin/rest/service/QueryService.java | 132 +-
 .../rest/controller/QueryControllerTest.java|   2 +-
 4 files changed, 134 insertions(+), 141 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/44cf9fba/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
--
diff --git 
a/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
 
b/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
index 9471937..c5f896d 100644
--- 
a/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
+++ 
b/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
@@ -23,15 +23,10 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.kylin.common.KylinConfig;
-import org.apache.kylin.common.debug.BackdoorToggles;
-import org.apache.kylin.rest.constant.Constant;
 import org.apache.kylin.rest.exception.InternalErrorException;
-import org.apache.kylin.rest.metrics.QueryMetricsFacade;
 import org.apache.kylin.rest.model.Query;
 import org.apache.kylin.rest.model.SelectedColumnMeta;
 import org.apache.kylin.rest.model.TableMeta;
@@ -41,12 +36,9 @@ import org.apache.kylin.rest.request.SQLRequest;
 import org.apache.kylin.rest.request.SaveSqlRequest;
 import org.apache.kylin.rest.response.SQLResponse;
 import org.apache.kylin.rest.service.QueryService;
-import org.apache.kylin.rest.util.QueryUtil;
-import org.apache.kylin.storage.exception.ScanOutOfLimitException;
 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;
@@ -58,12 +50,6 @@ import org.supercsv.io.CsvListWriter;
 import org.supercsv.io.ICsvListWriter;
 import org.supercsv.prefs.CsvPreference;
 
-import com.google.common.base.Preconditions;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.Element;
-
 /**
  * Handle query requests.
  * 
@@ -74,31 +60,20 @@ public class QueryController extends BasicController {
 
 private static final Logger logger = 
LoggerFactory.getLogger(QueryController.class);
 
-public static final String SUCCESS_QUERY_CACHE = "StorageCache";
-public static final String EXCEPTION_QUERY_CACHE = "ExceptionQueryCache";
-
 @Autowired
 private QueryService queryService;
 
-@Autowired
-private CacheManager cacheManager;
-
-@PostConstruct
-public void init() throws IOException {
-Preconditions.checkNotNull(cacheManager, "cacheManager is not injected 
yet");
-}
-
 @RequestMapping(value = "/query", method = RequestMethod.POST)
 @ResponseBody
 public SQLResponse query(@RequestBody SQLRequest sqlRequest) {
-return doQueryWithCache(sqlRequest);
+return queryService.doQueryWithCache(sqlRequest);
 }
 
 // TODO should be just "prepare" a statement, get back expected 
ResultSetMetaData
 @RequestMapping(value = "/query/prestate", method = RequestMethod.POST, 
produces = "application/json")
 @ResponseBody
 public SQLResponse prepareQuery(@RequestBody PrepareSqlRequest sqlRequest) 
{
-return doQueryWithCache(sqlRequest);
+return queryService.doQueryWithCache(sqlRequest);
 }
 
 @RequestMapping(value = "/saved_queries", method = RequestMethod.POST)
@@ -127,7 +102,7 @@ public class QueryController extends BasicController {
 @RequestMapping(value = "/query/format/{format}", method = 
RequestMethod.GET)
 @ResponseBody
 public void downloadQueryResult(@PathVariable String format, SQLRequest 
sqlRe