Repository: asterixdb
Updated Branches:
  refs/heads/master 384824ec5 -> 1be612a8e


Add query/aql endpoint.

Change-Id: Ib17f8d33adf49d75403c1cbdabebea2e0f3aeb4a
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1653
Sonar-Qube: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
BAD: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
Reviewed-by: Taewoo Kim <wangs...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/1be612a8
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/1be612a8
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/1be612a8

Branch: refs/heads/master
Commit: 1be612a8e38c0da5add4c91c1f43647a2b9adca0
Parents: 384824e
Author: Till Westmann <ti...@tcbm.attlocal.net>
Authored: Sat May 27 23:12:23 2017 -0700
Committer: Till Westmann <ti...@apache.org>
Committed: Thu Jun 1 17:03:30 2017 -0700

----------------------------------------------------------------------
 .../org/apache/asterix/hyracks/bootstrap/CCApplication.java     | 5 +++++
 .../src/main/java/org/apache/asterix/common/utils/Servlets.java | 1 +
 2 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1be612a8/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
index 61d93f5..21afdf1 100644
--- 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
+++ 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
@@ -222,6 +222,7 @@ public class CCApplication extends BaseCCApplication {
         addServlet(jsonAPIServer, Servlets.QUERY_STATUS);
         addServlet(jsonAPIServer, Servlets.QUERY_RESULT);
         addServlet(jsonAPIServer, Servlets.QUERY_SERVICE);
+        addServlet(jsonAPIServer, Servlets.QUERY_AQL);
         addServlet(jsonAPIServer, Servlets.RUNNING_REQUESTS);
         addServlet(jsonAPIServer, Servlets.CONNECTOR);
         addServlet(jsonAPIServer, Servlets.SHUTDOWN);
@@ -283,6 +284,10 @@ public class CCApplication extends BaseCCApplication {
                 return new QueryServiceServlet(ctx, paths, appCtx, SQLPP,
                         ccExtensionManager.getCompilationProvider(SQLPP), 
getStatementExecutorFactory(),
                         componentProvider);
+            case Servlets.QUERY_AQL:
+                return new QueryServiceServlet(ctx, paths, appCtx, AQL,
+                        ccExtensionManager.getCompilationProvider(AQL), 
getStatementExecutorFactory(),
+                        componentProvider);
             case Servlets.CONNECTOR:
                 return new ConnectorApiServlet(ctx, paths, appCtx);
             case Servlets.REBALANCE:

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1be612a8/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/Servlets.java
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/Servlets.java
 
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/Servlets.java
index 60e6060..a8a7390 100644
--- 
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/Servlets.java
+++ 
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/Servlets.java
@@ -31,6 +31,7 @@ public class Servlets {
     public static final String QUERY_STATUS = "/query/service/status/*";
     public static final String QUERY_RESULT = "/query/service/result/*";
     public static final String QUERY_SERVICE = "/query/service";
+    public static final String QUERY_AQL = "/query/aql";
     public static final String CONNECTOR = "/connector";
     public static final String REBALANCE = "/admin/rebalance";
     public static final String SHUTDOWN = "/admin/shutdown";

Reply via email to