You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by bi...@apache.org on 2013/11/20 04:39:31 UTC
git commit: TEZ-629. NPE in MRAMSplitGenerator (bikas)
Updated Branches:
refs/heads/master f9c9c0c9c -> 1885b9ed2
TEZ-629. NPE in MRAMSplitGenerator (bikas)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/1885b9ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/1885b9ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/1885b9ed
Branch: refs/heads/master
Commit: 1885b9ed252b7728eb7636a4a1c447a35504b4fa
Parents: f9c9c0c
Author: Bikas Saha <bi...@apache.org>
Authored: Tue Nov 19 19:35:55 2013 -0800
Committer: Bikas Saha <bi...@apache.org>
Committed: Tue Nov 19 19:35:55 2013 -0800
----------------------------------------------------------------------
.../mapreduce/common/MRInputAMSplitGenerator.java | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/1885b9ed/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputAMSplitGenerator.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputAMSplitGenerator.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputAMSplitGenerator.java
index b69c7df..da9ce55 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputAMSplitGenerator.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputAMSplitGenerator.java
@@ -104,14 +104,16 @@ public class MRInputAMSplitGenerator implements TezRootInputInitializer {
String rack =
((org.apache.hadoop.mapreduce.split.TezGroupedSplit) split).getRack();
if (rack == null) {
- locationHints.add(new TaskLocationHint(new HashSet<String>(Arrays
- .asList(split.getLocations())), null));
+ if (split.getLocations() != null) {
+ locationHints.add(new TaskLocationHint(new HashSet<String>(Arrays
+ .asList(split.getLocations())), null));
+ } else {
+ locationHints.add(new TaskLocationHint(null, null));
+ }
} else {
locationHints.add(new TaskLocationHint(null,
Collections.singleton(rack)));
}
- locationHints.add(new TaskLocationHint(new HashSet<String>(Arrays
- .asList(split.getLocations())), null));
}
inputSplitInfo = new InputSplitInfoMem(splitsBuilder.build(),
locationHints, splits.length);
@@ -128,8 +130,12 @@ public class MRInputAMSplitGenerator implements TezRootInputInitializer {
String rack =
((org.apache.hadoop.mapred.split.TezGroupedSplit) split).getRack();
if (rack == null) {
- locationHints.add(new TaskLocationHint(new HashSet<String>(Arrays
- .asList(split.getLocations())), null));
+ if (split.getLocations() != null) {
+ locationHints.add(new TaskLocationHint(new HashSet<String>(Arrays
+ .asList(split.getLocations())), null));
+ } else {
+ locationHints.add(new TaskLocationHint(null, null));
+ }
} else {
locationHints.add(new TaskLocationHint(null,
Collections.singleton(rack)));