tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rbalamo...@apache.org
Subject tez git commit: TEZ-2440. Sorter should check for indexCacheList.size() in flush() (rbalamohan)
Date Wed, 02 Sep 2015 02:26:05 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.7 6675ca087 -> dfb703d4a


TEZ-2440. Sorter should check for indexCacheList.size() in flush() (rbalamohan)


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

Branch: refs/heads/branch-0.7
Commit: dfb703d4a0988a6e5c346982e39d58e9d34500b7
Parents: 6675ca0
Author: Rajesh Balamohan <rbalamohan@apache.org>
Authored: Wed Sep 2 07:59:33 2015 +0530
Committer: Rajesh Balamohan <rbalamohan@apache.org>
Committed: Wed Sep 2 07:59:33 2015 +0530

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


http://git-wip-us.apache.org/repos/asf/tez/blob/dfb703d4/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e535512..944e355 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ Release 0.7.1: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-2440. Sorter should check for indexCacheList.size() in flush()
   TEZ-2742. VertexImpl.finished() terminationCause hides member var of the
   same name
   TEZ-2662. Provide a way to check whether AM or task opts are valid and error if not.

http://git-wip-us.apache.org/repos/asf/tez/blob/dfb703d4/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 e7cd81c..7b2a811 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
@@ -408,6 +408,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