You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by bl...@apache.org on 2015/06/21 14:31:42 UTC
tajo git commit: TAJO-1650: TestQueryResource.testGetAllQueries()
occasionally fails.
Repository: tajo
Updated Branches:
refs/heads/master b0df5e0df -> fc92be782
TAJO-1650: TestQueryResource.testGetAllQueries() occasionally fails.
Closes #607
Signed-off-by: JaeHwa Jung <bl...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/fc92be78
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/fc92be78
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/fc92be78
Branch: refs/heads/master
Commit: fc92be782c9375b80c9cc4edfbb6cc8d7eb241b4
Parents: b0df5e0
Author: Jinho Kim <jh...@apache.org>
Authored: Sun Jun 21 18:11:46 2015 +0900
Committer: JaeHwa Jung <bl...@apache.org>
Committed: Sun Jun 21 18:11:46 2015 +0900
----------------------------------------------------------------------
CHANGES | 3 +++
.../java/org/apache/tajo/ws/rs/resources/QueryResource.java | 9 ++-------
2 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/fc92be78/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index f8440b9..6c54511 100644
--- a/CHANGES
+++ b/CHANGES
@@ -159,6 +159,9 @@ Release 0.11.0 - unreleased
BUG FIXES
+ TAJO-1650: TestQueryResource.testGetAllQueries() occasionally fails.
+ (Contributed by jinho, Committed by jaehwa)
+
TAJO-1634: REST API: fix error when offset is zero.
(Contributed by DaeMyung Kang, Committed by jaehwa)
http://git-wip-us.apache.org/repos/asf/tajo/blob/fc92be78/tajo-core/src/main/java/org/apache/tajo/ws/rs/resources/QueryResource.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/ws/rs/resources/QueryResource.java b/tajo-core/src/main/java/org/apache/tajo/ws/rs/resources/QueryResource.java
index a662c4d..abecc3a 100644
--- a/tajo-core/src/main/java/org/apache/tajo/ws/rs/resources/QueryResource.java
+++ b/tajo-core/src/main/java/org/apache/tajo/ws/rs/resources/QueryResource.java
@@ -155,13 +155,8 @@ public class QueryResource {
for (QueryInProgress queryInProgress: queryManager.getRunningQueries()) {
queriesInfo.add(queryInProgress.getQueryInfo());
}
-
- try {
- queriesInfo.addAll(masterContext.getHistoryReader().getQueries(null));
- } catch (Exception e) {
- LOG.error(e.getMessage(), e);
- return ResourcesUtil.createExceptionResponse(LOG, e.getMessage());
- }
+
+ queriesInfo.addAll(queryManager.getFinishedQueries());
if (state != null) {
queriesInfo = selectQueriesInfoByState(queriesInfo, queryState);