Author: todd Date: Tue Jan 24 00:00:05 2012 New Revision: 1235078 URL: http://svn.apache.org/viewvc?rev=1235078&view=rev Log: Merge trunk into HA branch.
- Some conflicts on BlockManager due to the recent commit of HDFS-2822 - moved logic to processMisReplicatedBlock function - testNoExtensionIfNoBlocks(org.apache.hadoop.hdfs.TestSafeMode) is now failing due to an existing bug in the HA branch, to be fixed soon 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/io/compress/Decompressor.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=1235078&r1=1235077&r2=1235078&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 Tue Jan 24 00:00:05 2012 @@ -285,6 +285,9 @@ Release 0.23.1 - Unreleased HADOOP-7986. Adding config for MapReduce History Server protocol in hadoop-policy.xml for service level authorization. (Mahadev Konar via vinodkv) + HADOOP-7981. Improve documentation for org.apache.hadoop.io.compress. + Decompressor.getRemaining (Jonathan Eagles via mahadev) + Release 0.23.0 - 2011-11-01 INCOMPATIBLE CHANGES Propchange: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 24 00:00:05 2012 @@ -1,5 +1,5 @@ /hadoop/common/branches/yahoo-merge/CHANGES.txt:1079157,1079163-1079164,1079167 -/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:1161333-1234923 +/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:1161333-1235069 /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 Tue Jan 24 00:00:05 2012 @@ -1,2 +1,2 @@ -/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:1152502-1234923 +/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:1152502-1235069 /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 Tue Jan 24 00:00:05 2012 @@ -1,3 +1,3 @@ -/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:1152502-1234923 +/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:1152502-1235069 /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/io/compress/Decompressor.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/Decompressor.java?rev=1235078&r1=1235077&r2=1235078&view=diff ============================================================================== --- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/Decompressor.java (original) +++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/Decompressor.java Tue Jan 24 00:00:05 2012 @@ -49,7 +49,7 @@ public interface Decompressor { public void setInput(byte[] b, int off, int len); /** - * Returns true if the input data buffer is empty and + * Returns <code>true</code> if the input data buffer is empty and * {@link #setInput(byte[], int, int)} should be called to * provide more input. * @@ -76,8 +76,11 @@ public interface Decompressor { public boolean needsDictionary(); /** - * Returns true if the end of the decompressed - * data output stream has been reached. + * Returns <code>true</code> if the end of the decompressed + * data output stream has been reached. Indicates a concatenated data stream + * when finished() returns <code>true</code> and {@link #getRemaining()} + * returns a positive value. finished() will be reset with the + * {@link #reset()} method. * @return <code>true</code> if the end of the decompressed * data output stream has been reached. */ @@ -98,15 +101,23 @@ public interface Decompressor { public int decompress(byte[] b, int off, int len) throws IOException; /** - * Returns the number of bytes remaining in the compressed-data buffer; - * typically called after the decompressor has finished decompressing - * the current gzip stream (a.k.a. "member"). + * Returns the number of bytes remaining in the compressed data buffer. + * Indicates a concatenated data stream if {@link #finished()} returns + * <code>true</code> and getRemaining() returns a positive value. If + * {@link #finished()} returns <code>true</code> and getRemaining() returns + * a zero value, indicates that the end of data stream has been reached and + * is not a concatenated data stream. + * @return The number of bytes remaining in the compressed data buffer. */ public int getRemaining(); /** * Resets decompressor and input and output buffers so that a new set of - * input data can be processed. + * input data can be processed. If {@link #finished()}} returns + * <code>true</code> and {@link #getRemaining()} returns a positive value, + * reset() is called before processing of the next data stream in the + * concatenated data stream. {@link #finished()} will be reset and will + * return <code>false</code> when reset() is called. */ public void reset(); Propchange: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/core/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 24 00:00:05 2012 @@ -1,3 +1,3 @@ -/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:1152502-1234923 +/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:1152502-1235069 /hadoop/core/branches/branch-0.19/core/src/test/core:713112 /hadoop/core/trunk/src/test/core:776175-785643,785929-786278