You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2013/12/11 15:37:42 UTC
git commit: TAJO-390: Queries on history are expired ealier than a
given expiry time. (hyoungjunkim via hyunsik)
Updated Branches:
refs/heads/master df56fca7c -> 0ee6b2432
TAJO-390: Queries on history are expired ealier than a given expiry time. (hyoungjunkim via hyunsik)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/0ee6b243
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/0ee6b243
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/0ee6b243
Branch: refs/heads/master
Commit: 0ee6b2432efbc809e60df6de073f839d3a2b9894
Parents: df56fca
Author: Hyunsik Choi <hy...@apache.org>
Authored: Wed Dec 11 23:35:34 2013 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Wed Dec 11 23:36:25 2013 +0900
----------------------------------------------------------------------
CHANGES.txt | 6 +++++-
.../java/org/apache/tajo/master/querymaster/QueryMaster.java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/0ee6b243/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e7e8074..1047c9f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -92,7 +92,8 @@ Release 0.8.0 - unreleased
TAJO-336: Separate catalog stores into separate modules. (jaehwa)
- TAJO-329: Implement physical operator to store in column-partitioned table. (jaehwa)
+ TAJO-329: Implement physical operator to store in column-partitioned table.
+ (jaehwa)
TAJO-391: Change the default type of real values from FLOAT4 to FLOAT8
when parsing the user queries. (DaeMyung Kang via jihoon)
@@ -139,6 +140,9 @@ Release 0.8.0 - unreleased
BUG FIXES
+ TAJO-390: Queries on history are expired ealier than a given expiry time.
+ (hyoungjunkim via hyunsik)
+
TAJO-410: A query with a combination of general and distinct aggregation
functions fails. (hyunsik)
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/0ee6b243/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryMaster.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryMaster.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryMaster.java
index 41b3b5e..02d3d81 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryMaster.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryMaster.java
@@ -498,7 +498,7 @@ public class QueryMaster extends CompositeService implements EventHandler {
synchronized(finishedQueryMasterTasks) {
List<QueryId> expiredQueryIds = new ArrayList<QueryId>();
for(Map.Entry<QueryId, QueryMasterTask> entry: finishedQueryMasterTasks.entrySet()) {
- if(entry.getValue().getStartTime() > expireTime) {
+ if(entry.getValue().getStartTime() < expireTime) {
expiredQueryIds.add(entry.getKey());
}
}