You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by ss...@apache.org on 2014/02/27 06:26:12 UTC
git commit: TEZ-898. Handle inputReady and initial memory request in
case of 0 physical inputs. (sseth)
Repository: incubator-tez
Updated Branches:
refs/heads/master 444a96355 -> 847cbaa35
TEZ-898. Handle inputReady and initial memory request in case of 0
physical inputs. (sseth)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/847cbaa3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/847cbaa3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/847cbaa3
Branch: refs/heads/master
Commit: 847cbaa35a781cef2a7ca6206bdcdbc1eb92badd
Parents: 444a963
Author: Siddharth Seth <ss...@apache.org>
Authored: Wed Feb 26 21:25:30 2014 -0800
Committer: Siddharth Seth <ss...@apache.org>
Committed: Wed Feb 26 21:25:30 2014 -0800
----------------------------------------------------------------------
.../apache/tez/runtime/library/input/ShuffledMergedInput.java | 3 +++
.../tez/runtime/library/input/ShuffledUnorderedKVInput.java | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/847cbaa3/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ShuffledMergedInput.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ShuffledMergedInput.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ShuffledMergedInput.java
index de707a5..1f02fb5 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ShuffledMergedInput.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ShuffledMergedInput.java
@@ -80,6 +80,9 @@ public class ShuffledMergedInput implements LogicalInput {
this.conf = TezUtils.createConfFromUserPayload(inputContext.getUserPayload());
if (this.numInputs == 0) {
+ inputContext.requestInitialMemory(0l, null);
+ isStarted.set(true);
+ inputContext.inputIsReady();
return Collections.emptyList();
}
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/847cbaa3/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ShuffledUnorderedKVInput.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ShuffledUnorderedKVInput.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ShuffledUnorderedKVInput.java
index d216eeb..0cd478c 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ShuffledUnorderedKVInput.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ShuffledUnorderedKVInput.java
@@ -63,7 +63,10 @@ public class ShuffledUnorderedKVInput implements LogicalInput {
this.conf.setStrings(TezJobConfig.LOCAL_DIRS, inputContext.getWorkDirs());
if (numInputs == 0) {
- return null;
+ inputContext.requestInitialMemory(0l, null);
+ isStarted.set(true);
+ inputContext.inputIsReady();
+ return Collections.emptyList();
}
this.shuffleManager = new BroadcastShuffleManager(inputContext, conf, numInputs);