You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by ti...@apache.org on 2016/08/03 05:05:16 UTC
asterixdb git commit: Pass compilation provider to QueryServiceServlet
Repository: asterixdb
Updated Branches:
refs/heads/master 516d1a85b -> 0ab8ae44d
Pass compilation provider to QueryServiceServlet
Change-Id: I795a2dab622ab40b39f6aaf548a27ffbd40c9efd
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1043
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Yingyi Bu <bu...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/0ab8ae44
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/0ab8ae44
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/0ab8ae44
Branch: refs/heads/master
Commit: 0ab8ae44df2ae069a0cd73782b94fbd16af0ab2d
Parents: 516d1a8
Author: Till Westmann <ti...@apache.org>
Authored: Tue Aug 2 15:53:02 2016 -0700
Committer: Till Westmann <ti...@apache.org>
Committed: Tue Aug 2 22:04:44 2016 -0700
----------------------------------------------------------------------
.../apache/asterix/api/http/servlet/QueryServiceServlet.java | 6 +++++-
.../asterix/hyracks/bootstrap/CCApplicationEntryPoint.java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/0ab8ae44/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java
index 2e6ee58..f208694 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java
@@ -61,7 +61,7 @@ public class QueryServiceServlet extends HttpServlet {
private static final Logger LOGGER = Logger.getLogger(QueryServiceServlet.class.getName());
- private transient final ILangCompilationProvider compilationProvider = new SqlppCompilationProvider();
+ private transient final ILangCompilationProvider compilationProvider;
public enum Parameter {
// Standard
@@ -210,6 +210,10 @@ public class QueryServiceServlet extends HttpServlet {
}
}
+ public QueryServiceServlet(final ILangCompilationProvider compilationProvider) {
+ this.compilationProvider = compilationProvider;
+ }
+
private static String getParameterValue(String content, String attribute) {
int sc = content.indexOf(';');
if (sc < 0) {
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/0ab8ae44/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java
index b77544e..916c81f 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java
@@ -233,7 +233,7 @@ public class CCApplicationEntryPoint implements ICCApplicationEntryPoint {
case QUERY_RESULT:
return new QueryResultAPIServlet();
case QUERY_SERVICE:
- return new QueryServiceServlet();
+ return new QueryServiceServlet(new SqlppCompilationProvider());
case CONNECTOR:
return new ConnectorAPIServlet();
case SHUTDOWN: