asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amo...@apache.org
Subject asterixdb git commit: [NO ISSUE][OTH] Cancel Query on interrupt
Date Sun, 27 Aug 2017 15:12:46 GMT
Repository: asterixdb
Updated Branches:
  refs/heads/master 00ce8748c -> a5843a277


[NO ISSUE][OTH] Cancel Query on interrupt

- user model changes: no
- storage format changes: no
- interface changes: no

details:
- Cancel queries that are submitted through NC query service in
  the event of interrupt.

Change-Id: I287f8f605afe432b4459ae536941e4708dac18af
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1976
Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Xikui Wang <xkkwww@gmail.com>
Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>


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

Branch: refs/heads/master
Commit: a5843a277504d33589888e2a9b1c1fb869de2109
Parents: 00ce874
Author: Abdullah Alamoudi <bamousaa@gmail.com>
Authored: Sat Aug 26 20:17:38 2017 -0700
Committer: abdullah alamoudi <bamousaa@gmail.com>
Committed: Sun Aug 27 08:12:20 2017 -0700

----------------------------------------------------------------------
 .../org/apache/asterix/api/http/server/NCQueryServiceServlet.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/a5843a27/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryServiceServlet.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryServiceServlet.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryServiceServlet.java
index ef49c35..69e995b 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryServiceServlet.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryServiceServlet.java
@@ -85,7 +85,7 @@ public class NCQueryServiceServlet extends QueryServiceServlet {
             try {
                 responseMsg = (ExecuteStatementResponseMessage) responseFuture.get(timeout,
                         java.util.concurrent.TimeUnit.MILLISECONDS);
-            } catch (TimeoutException exception) {
+            } catch (InterruptedException | TimeoutException exception) {
                 RuntimeDataException hde = new RuntimeDataException(ErrorCode.QUERY_TIMEOUT,
exception);
                 // cancel query
                 cancelQuery(ncMb, ncCtx.getNodeId(), param.clientContextID, hde);


Mime
View raw message