Repository: tajo Updated Branches: refs/heads/master 2548768cf -> ff57c77ea
TAJO-1254: Fix getProgress race conditions in Query. (jinho) Closes #304 Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/ff57c77e Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/ff57c77e Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/ff57c77e Branch: refs/heads/master Commit: ff57c77ea6ea790a0689b59272600325e5b73345 Parents: 2548768 Author: jhkim <[email protected]> Authored: Thu Dec 18 11:57:43 2014 +0900 Committer: jhkim <[email protected]> Committed: Thu Dec 18 11:57:43 2014 +0900 ---------------------------------------------------------------------- CHANGES | 2 ++ .../src/main/java/org/apache/tajo/master/querymaster/Query.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/ff57c77e/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index de63285..6b9146a 100644 --- a/CHANGES +++ b/CHANGES @@ -111,6 +111,8 @@ Release 0.9.1 - unreleased BUG FIXES + TAJO-1254: Fix getProgress race conditions in Query. (jinho) + TAJO-1252: PathValidator should allow hdfs paths which contain IP addresses. (jihoon) http://git-wip-us.apache.org/repos/asf/tajo/blob/ff57c77e/tajo-core/src/main/java/org/apache/tajo/master/querymaster/Query.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/master/querymaster/Query.java b/tajo-core/src/main/java/org/apache/tajo/master/querymaster/Query.java index a048780..918cc82 100644 --- a/tajo-core/src/main/java/org/apache/tajo/master/querymaster/Query.java +++ b/tajo-core/src/main/java/org/apache/tajo/master/querymaster/Query.java @@ -206,7 +206,7 @@ public class Query implements EventHandler<QueryEvent> { this.clock = context.getClock(); this.appSubmitTime = appSubmitTime; this.queryStr = queryStr; - subqueries = Maps.newHashMap(); + this.subqueries = Maps.newConcurrentMap(); this.eventHandler = eventHandler; this.plan = plan; this.cursor = new ExecutionBlockCursor(plan, true);
