tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hyun...@apache.org
Subject git commit: TAJO-244: assignToNonLeafTasks causes NPE occurs occasionally . (hyunsik)
Date Sun, 13 Oct 2013 14:12:05 GMT
Updated Branches:
  refs/heads/master d01e47d3f -> b23c2b5fe


TAJO-244: assignToNonLeafTasks causes NPE occurs occasionally . (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/b23c2b5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/b23c2b5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/b23c2b5f

Branch: refs/heads/master
Commit: b23c2b5fef3a385d19ebb23e60f3ce80f3589707
Parents: d01e47d
Author: Hyunsik Choi <hyunsik@apache.org>
Authored: Sun Oct 13 23:10:05 2013 +0900
Committer: Hyunsik Choi <hyunsik@apache.org>
Committed: Sun Oct 13 23:10:05 2013 +0900

----------------------------------------------------------------------
 CHANGES.txt                                                      | 2 ++
 .../java/org/apache/tajo/worker/AbstractResourceAllocator.java   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/b23c2b5f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0b700dd..ae4ff35 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -197,6 +197,8 @@ Release 0.2.0 - unreleased
 
   BUG FIXES
 
+    TAJO-244: assignToNonLeafTasks causes NPE occurs occasionally. (hyunsik)
+
     TAJO-242: Enable omitted broadcast join feature after TAJO-184. (hyunsik)
 
     TAJO-240: Reformat HiveConverter source code to match adopted conventions 

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/b23c2b5f/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/AbstractResourceAllocator.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/AbstractResourceAllocator.java
b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/AbstractResourceAllocator.java
index c75fd96..c901e29 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/AbstractResourceAllocator.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/AbstractResourceAllocator.java
@@ -18,15 +18,15 @@
 
 package org.apache.tajo.worker;
 
+import com.google.common.collect.Maps;
 import org.apache.hadoop.yarn.api.records.ContainerId;
 import org.apache.hadoop.yarn.service.CompositeService;
 import org.apache.tajo.master.ContainerProxy;
 
-import java.util.HashMap;
 import java.util.Map;
 
 public abstract class AbstractResourceAllocator extends CompositeService implements ResourceAllocator
{
-  private Map<ContainerId, ContainerProxy> containers = new HashMap<ContainerId,
ContainerProxy>();
+  private Map<ContainerId, ContainerProxy> containers = Maps.newConcurrentMap();
 
   public AbstractResourceAllocator() {
     super(AbstractResourceAllocator.class.getName());


Mime
View raw message