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/03/02 02:48:34 UTC
svn commit: r1296025 - in
/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common: ./
src/main/docs/ src/main/java/ src/main/java/org/apache/hadoop/fs/
src/main/java/org/apache/hadoop/io/ src/test/core/
Author: todd
Date: Fri Mar 2 01:48:32 2012
New Revision: 1296025
URL: http://svn.apache.org/viewvc?rev=1296025&view=rev
Log:
Merge trunk into HA branch
Modified:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed)
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/docs/ (props changed)
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/ (props changed)
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataOutputStream.java
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Syncable.java
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/core/ (props changed)
Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1296025&r1=1296024&r2=1296025&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt Fri Mar 2 01:48:32 2012
@@ -4,6 +4,9 @@ Trunk (unreleased changes)
INCOMPATIBLE CHANGES
+ HADOOP-8124. Remove the deprecated FSDataOutputStream constructor,
+ FSDataOutputStream.sync() and Syncable.sync(). (szetszwo)
+
NEW FEATURES
IMPROVEMENTS
Propchange: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 2 01:48:32 2012
@@ -1,6 +1,6 @@
/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt:1243206,1291081
/hadoop/common/branches/yahoo-merge/CHANGES.txt:1079157,1079163-1079164,1079167
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:1161333-1295332
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:1161333-1296022
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278
Propchange: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 2 01:48:32 2012
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:1152502-1295332
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:1152502-1296022
/hadoop/core/branches/branch-0.19/src/docs:713112
Propchange: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 2 01:48:32 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:1152502-1295332
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:1152502-1296022
/hadoop/core/branches/branch-0.19/core/src/java:713112
/hadoop/core/trunk/src/core:776175-785643,785929-786278
Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataOutputStream.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataOutputStream.java?rev=1296025&r1=1296024&r2=1296025&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataOutputStream.java (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataOutputStream.java Fri Mar 2 01:48:32 2012
@@ -17,7 +17,11 @@
*/
package org.apache.hadoop.fs;
-import java.io.*;
+import java.io.BufferedOutputStream;
+import java.io.DataOutputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
@@ -28,20 +32,19 @@ import org.apache.hadoop.classification.
@InterfaceAudience.Public
@InterfaceStability.Stable
public class FSDataOutputStream extends DataOutputStream implements Syncable {
- private OutputStream wrappedStream;
+ private final OutputStream wrappedStream;
private static class PositionCache extends FilterOutputStream {
- private FileSystem.Statistics statistics;
- long position;
+ private final FileSystem.Statistics statistics;
+ private long position;
- public PositionCache(OutputStream out,
- FileSystem.Statistics stats,
- long pos) throws IOException {
+ PositionCache(OutputStream out, FileSystem.Statistics stats, long pos) {
super(out);
statistics = stats;
position = pos;
}
+ @Override
public void write(int b) throws IOException {
out.write(b);
position++;
@@ -50,6 +53,7 @@ public class FSDataOutputStream extends
}
}
+ @Override
public void write(byte b[], int off, int len) throws IOException {
out.write(b, off, len);
position += len; // update position
@@ -58,27 +62,22 @@ public class FSDataOutputStream extends
}
}
- public long getPos() throws IOException {
+ long getPos() {
return position; // return cached position
}
-
+
+ @Override
public void close() throws IOException {
out.close();
}
}
- @Deprecated
- public FSDataOutputStream(OutputStream out) throws IOException {
- this(out, null);
- }
-
- public FSDataOutputStream(OutputStream out, FileSystem.Statistics stats)
- throws IOException {
+ public FSDataOutputStream(OutputStream out, FileSystem.Statistics stats) {
this(out, stats, 0);
}
public FSDataOutputStream(OutputStream out, FileSystem.Statistics stats,
- long startPosition) throws IOException {
+ long startPosition) {
super(new PositionCache(out, stats, startPosition));
wrappedStream = out;
}
@@ -88,13 +87,14 @@ public class FSDataOutputStream extends
*
* @return the current position in the output stream
*/
- public long getPos() throws IOException {
+ public long getPos() {
return ((PositionCache)out).getPos();
}
/**
* Close the underlying output stream.
*/
+ @Override
public void close() throws IOException {
out.close(); // This invokes PositionCache.close()
}
@@ -110,14 +110,6 @@ public class FSDataOutputStream extends
}
@Override // Syncable
- @Deprecated
- public void sync() throws IOException {
- if (wrappedStream instanceof Syncable) {
- ((Syncable)wrappedStream).sync();
- }
- }
-
- @Override // Syncable
public void hflush() throws IOException {
if (wrappedStream instanceof Syncable) {
((Syncable)wrappedStream).hflush();
Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Syncable.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Syncable.java?rev=1296025&r1=1296024&r2=1296025&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Syncable.java (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Syncable.java Fri Mar 2 01:48:32 2012
@@ -27,11 +27,6 @@ import org.apache.hadoop.classification.
@InterfaceAudience.Public
@InterfaceStability.Evolving
public interface Syncable {
- /**
- * @deprecated As of HADOOP 0.21.0, replaced by hflush
- * @see #hflush()
- */
- @Deprecated public void sync() throws IOException;
/** Flush out the data in client's user buffer. After the return of
* this call, new readers will see the data.
Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java?rev=1296025&r1=1296024&r2=1296025&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java Fri Mar 2 01:48:32 2012
@@ -1196,7 +1196,7 @@ 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
+ out.hflush(); // flush contents to file system
}
}
Propchange: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 2 01:48:32 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:1152502-1295332
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:1152502-1296022
/hadoop/core/branches/branch-0.19/core/src/test/core:713112
/hadoop/core/trunk/src/test/core:776175-785643,785929-786278