hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s..@apache.org
Subject svn commit: r1058344 - in /hadoop/common/branches/branch-0.22: CHANGES.txt src/java/core-default.xml src/java/org/apache/hadoop/io/SequenceFile.java
Date Wed, 12 Jan 2011 22:48:30 GMT
Author: shv
Date: Wed Jan 12 22:48:30 2011
New Revision: 1058344

URL: http://svn.apache.org/viewvc?rev=1058344&view=rev
Log:
HADOOP-7102. Merge -r 1058342:1058343 from trunk to branch 0.22.

Modified:
    hadoop/common/branches/branch-0.22/CHANGES.txt
    hadoop/common/branches/branch-0.22/src/java/core-default.xml
    hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/io/SequenceFile.java

Modified: hadoop/common/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/CHANGES.txt?rev=1058344&r1=1058343&r2=1058344&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/CHANGES.txt Wed Jan 12 22:48:30 2011
@@ -199,6 +199,8 @@ Release 0.22.0 - Unreleased
     HADOOP-6811. Remove EC2 bash scripts. They are replaced by Apache Whirr
     (incubating, http://incubator.apache.org/whirr). (tomwhite)
 
+    HADOOP-7102. Remove "fs.ramfs.impl" field from core-deafult.xml (shv)
+
   OPTIMIZATIONS
 
     HADOOP-6884. Add LOG.isDebugEnabled() guard for each LOG.debug(..).

Modified: hadoop/common/branches/branch-0.22/src/java/core-default.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/java/core-default.xml?rev=1058344&r1=1058343&r2=1058344&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/src/java/core-default.xml (original)
+++ hadoop/common/branches/branch-0.22/src/java/core-default.xml Wed Jan 12 22:48:30 2011
@@ -298,12 +298,6 @@
 </property>
 
 <property>
-  <name>fs.ramfs.impl</name>
-  <value>org.apache.hadoop.fs.InMemoryFileSystem</value>
-  <description>The FileSystem for ramfs: uris.</description>
-</property>
-
-<property>
   <name>fs.har.impl</name>
   <value>org.apache.hadoop.fs.HarFileSystem</value>
   <description>The filesystem for Hadoop archives. </description>

Modified: hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/io/SequenceFile.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/io/SequenceFile.java?rev=1058344&r1=1058343&r2=1058344&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/io/SequenceFile.java (original)
+++ hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/io/SequenceFile.java Wed
Jan 12 22:48:30 2011
@@ -3371,9 +3371,6 @@ public class SequenceFile {
       public boolean nextRawKey() throws IOException {
         if (in == null) {
           int bufferSize = getBufferSize(conf); 
-          if (fs.getUri().getScheme().startsWith("ramfs")) {
-            bufferSize = conf.getInt("io.bytes.per.checksum", 512);
-          }
           Reader reader = new Reader(conf,
                                      Reader.file(segmentPathName), 
                                      Reader.bufferSize(bufferSize),



Mime
View raw message