You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by pu...@apache.org on 2016/10/25 10:25:13 UTC

[15/31] lens git commit: LENS-1282: getUpdatedQueryContext() call is missing from QueryExecutionServiceImpl#executeTimeoutInternal

LENS-1282: getUpdatedQueryContext() call is missing from QueryExecutionServiceImpl#executeTimeoutInternal


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

Branch: refs/heads/master
Commit: 466cee342d9657d8ca2348efbd7393c47ed0d3d0
Parents: 2748cd9
Author: Puneet Gupta <pu...@gmail.com>
Authored: Mon Aug 22 18:20:48 2016 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Tue Aug 23 11:05:09 2016 +0530

----------------------------------------------------------------------
 .../apache/lens/server/query/QueryExecutionServiceImpl.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lens/blob/466cee34/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java b/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java
index 84dcecd..896ddbb 100644
--- a/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java
+++ b/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java
@@ -2294,9 +2294,15 @@ public class QueryExecutionServiceImpl extends BaseLensService implements QueryE
         long totalWaitMillisSoFar = 0;
         synchronized (listener) {
           while (totalWaitMillisSoFar < totalWaitTime
-            && !queryCtx.getStatus().executed() && !queryCtx.getStatus().finished()) {
+            && !listener.querySuccessful
+            && !queryCtx.getStatus().executed()
+            && !queryCtx.getStatus().finished()) {
             listener.wait(waitMillisPerCheck);
             totalWaitMillisSoFar += waitMillisPerCheck;
+            if (!listener.querySuccessful) {
+              //update ths status in case query is not successful yet
+              queryCtx = getUpdatedQueryContext(sessionHandle, handle);
+            }
           }
         }
       } catch (InterruptedException e) {