You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by to...@apache.org on 2012/01/06 18:33:25 UTC
svn commit: r1228295 - in /hadoop/common/branches/branch-0.22/common:
CHANGES.txt src/java/org/apache/hadoop/io/SequenceFile.java
Author: tomwhite
Date: Fri Jan 6 17:33:25 2012
New Revision: 1228295
URL: http://svn.apache.org/viewvc?rev=1228295&view=rev
Log:
Merge -r 1228290:1228291 from trunk to branch-0.22. Fixes: HADOOP-7937
Modified:
hadoop/common/branches/branch-0.22/common/CHANGES.txt
hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/io/SequenceFile.java
Modified: hadoop/common/branches/branch-0.22/common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/CHANGES.txt?rev=1228295&r1=1228294&r2=1228295&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/common/CHANGES.txt Fri Jan 6 17:33:25 2012
@@ -12,6 +12,10 @@ Release 0.22.1 - Unreleased
BUG FIXES
+ HADOOP-7937. Forward port SequenceFile#syncFs and friends from Hadoop 1.x.
+ (tomwhite)
+
+
Release 0.22.0 - 2011-11-29
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/io/SequenceFile.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/io/SequenceFile.java?rev=1228295&r1=1228294&r2=1228295&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/io/SequenceFile.java (original)
+++ hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/io/SequenceFile.java Fri Jan 6 17:33:25 2012
@@ -1128,6 +1128,13 @@ public class SequenceFile {
}
}
+ /** flush all currently written data to the file system */
+ public void syncFs() throws IOException {
+ if (out != null) {
+ out.sync(); // flush contents to file system
+ }
+ }
+
/** Returns the configuration of this file. */
Configuration getConf() { return conf; }