Repository: incubator-lens Updated Branches: refs/heads/master f1387c315 -> 7f4d793fb
LENS-387: Propagate error for failing in QueryHandleWithResultSet in EXECUTE_WITH_TIMEOUT queries Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/7f4d793f Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/7f4d793f Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/7f4d793f Branch: refs/heads/master Commit: 7f4d793fb12333817b57fb57c1f9ffa272d6435f Parents: f1387c3 Author: Tushar Ghosh <[email protected]> Authored: Mon Jul 13 15:10:03 2015 +0530 Committer: Rajat Khandelwal <[email protected]> Committed: Mon Jul 13 15:10:03 2015 +0530 ---------------------------------------------------------------------- .../org/apache/lens/api/query/QueryHandleWithResultSet.java | 7 +++++++ .../apache/lens/server/query/QueryExecutionServiceImpl.java | 4 ++++ .../java/org/apache/lens/server/query/TestQueryService.java | 5 +---- 3 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/7f4d793f/lens-api/src/main/java/org/apache/lens/api/query/QueryHandleWithResultSet.java ---------------------------------------------------------------------- diff --git a/lens-api/src/main/java/org/apache/lens/api/query/QueryHandleWithResultSet.java b/lens-api/src/main/java/org/apache/lens/api/query/QueryHandleWithResultSet.java index 4fd5081..a5da867 100644 --- a/lens-api/src/main/java/org/apache/lens/api/query/QueryHandleWithResultSet.java +++ b/lens-api/src/main/java/org/apache/lens/api/query/QueryHandleWithResultSet.java @@ -54,6 +54,13 @@ public class QueryHandleWithResultSet extends QuerySubmitResult { private QueryResult result; /** + * The status. + */ + @Getter + @Setter + private QueryStatus status; + + /** * Instantiates a new query handle with result set. * * @param handle the handle http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/7f4d793f/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 8a32202..a778a1f 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 @@ -1749,6 +1749,7 @@ public class QueryExecutionServiceImpl extends LensService implements QueryExecu } QueryCompletionListener listener = new QueryCompletionListenerImpl(handle); if (getQueryContext(sessionHandle, handle).getSelectedDriver() == null) { + result.setStatus(getQueryContext(sessionHandle, handle).getStatus()); return result; } synchronized (ctx) { @@ -1770,6 +1771,9 @@ public class QueryExecutionServiceImpl extends LensService implements QueryExecu result.setResult(getResultset(handle).toQueryResult()); } } + + result.setStatus(getQueryContext(sessionHandle, handle).getStatus()); + return result; } http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/7f4d793f/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java ---------------------------------------------------------------------- diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java index 76d3dee..59066f9 100644 --- a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java +++ b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java @@ -1230,10 +1230,7 @@ public class TestQueryService extends LensJerseyTest { new GenericType<LensAPIResult<QueryHandleWithResultSet>>() {}).getData(); Assert.assertNotNull(result.getQueryHandle()); Assert.assertNull(result.getResult()); - - LensQuery ctx = target.path(result.getQueryHandle().toString()).queryParam("sessionid", lensSessionId).request() - .get(LensQuery.class); - Assert.assertEquals(ctx.getStatus().getStatus(), Status.FAILED); + Assert.assertEquals(result.getStatus().getStatus(), Status.FAILED); } /**
