tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ss...@apache.org
Subject [06/50] [abbrv] tez git commit: TEZ-2440. Sorter should check for indexCacheList.size() in flush() (Contributed by Mit Desai)
Date Mon, 01 Jun 2015 23:36:44 GMT
TEZ-2440. Sorter should check for indexCacheList.size() in flush() (Contributed by Mit Desai)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/fe74d6b9
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/fe74d6b9
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/fe74d6b9

Branch: refs/heads/TEZ-2003
Commit: fe74d6b9e896dfe158392ffe91fbad944abba027
Parents: 317d45a
Author: Rajesh Balamohan <rbalamohan@apache.org>
Authored: Thu May 28 04:44:33 2015 +0530
Committer: Rajesh Balamohan <rbalamohan@apache.org>
Committed: Thu May 28 04:44:33 2015 +0530

----------------------------------------------------------------------
 CHANGES.txt                                                 | 1 +
 .../runtime/library/common/sort/impl/PipelinedSorter.java   | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/fe74d6b9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4779f83..f676ef7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@ INCOMPATIBLE CHANGES
   TEZ-2468. Change the minimum Java version to Java 7.
 
 ALL CHANGES:
+  TEZ-2440. Sorter should check for indexCacheList.size() in flush().
   TEZ-2490. TEZ-2450 breaks Hadoop 2.2 and 2.4 compatability.
   TEZ-2450. support async http clients in ordered & unordered inputs.
   TEZ-2454. Change FetcherOrderedGroup to work as Callables instead of blocking threads.

http://git-wip-us.apache.org/repos/asf/tez/blob/fe74d6b9/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/PipelinedSorter.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/PipelinedSorter.java
b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/PipelinedSorter.java
index d9de921..9113fca 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/PipelinedSorter.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/PipelinedSorter.java
@@ -404,10 +404,6 @@ public class PipelinedSorter extends ExternalSorter {
     }
   }
 
-
-
-
-
   private boolean isThreadInterrupted() throws IOException {
     if (Thread.currentThread().isInterrupted()) {
       if (cleanup) {
@@ -446,6 +442,11 @@ public class PipelinedSorter extends ExternalSorter {
 
       numAdditionalSpills.increment(numSpills - 1);
 
+      if(indexCacheList.isEmpty()) {
+        LOG.warn("Index list is empty... returning");
+        return;
+      }
+
       if (!finalMergeEnabled) {
         //Generate events for all spills
         List<Event> events = Lists.newLinkedList();


Mime
View raw message