tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gop...@apache.org
Subject git commit: TEZ-1634. Fix compressed IFile shuffle errors (Rajesh Balamohan via gopalv)
Date Wed, 01 Oct 2014 02:02:57 GMT
Repository: tez
Updated Branches:
  refs/heads/master 7ebe629f6 -> 2103129a2


TEZ-1634. Fix compressed IFile shuffle errors (Rajesh Balamohan via gopalv)


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

Branch: refs/heads/master
Commit: 2103129a28cbcdb2282b3a3e0e2aa230c0b5e756
Parents: 7ebe629
Author: Gopal V <gopalv@apache.org>
Authored: Tue Sep 30 19:02:44 2014 -0700
Committer: Gopal V <gopalv@apache.org>
Committed: Tue Sep 30 19:02:44 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                                           |  1 +
 .../tez/runtime/library/common/sort/impl/IFile.java   | 14 ++++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/2103129a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 38a415a..0be2a65 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ Release 0.6.0: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-1634. Fix compressed IFile shuffle errors
 
 Release 0.5.2: Unreleased
 

http://git-wip-us.apache.org/repos/asf/tez/blob/2103129a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/IFile.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/IFile.java
b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/IFile.java
index 6ad7915..0085652 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/IFile.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/IFile.java
@@ -219,17 +219,15 @@ public class IFile {
       //Flush the stream
       out.flush();
 
-      if (compressOutput) {
-        // Flush
-        compressedOut.finish();
-        compressedOut.resetState();
-      }
-
       // Close the underlying stream iff we own it...
       if (ownOutputStream) {
         out.close();
-      }
-      else {
+      } else {
+        if (compressOutput) {
+          // Flush
+          compressedOut.finish();
+          compressedOut.resetState();
+        }
         // Write the checksum
         checksumOut.finish();
       }


Mime
View raw message