hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hair...@apache.org
Subject svn commit: r704702 - in /hadoop/core/branches/branch-0.19: ./ CHANGES.txt src/core/org/apache/hadoop/fs/ChecksumFileSystem.java src/test/org/apache/hadoop/fs/TestLocalFileSystem.java
Date Tue, 14 Oct 2008 21:50:38 GMT
Author: hairong
Date: Tue Oct 14 14:50:37 2008
New Revision: 704702

URL: http://svn.apache.org/viewvc?rev=704702&view=rev
Log:
Merge -r 704700:704701 from trunk to main to move the changelog of HADOOP-4292.

Modified:
    hadoop/core/branches/branch-0.19/   (props changed)
    hadoop/core/branches/branch-0.19/CHANGES.txt
    hadoop/core/branches/branch-0.19/src/core/org/apache/hadoop/fs/ChecksumFileSystem.java
    hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/fs/TestLocalFileSystem.java

Propchange: hadoop/core/branches/branch-0.19/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 14 14:50:37 2008
@@ -1 +1 @@
-/hadoop/core/trunk:697306,698176,699056,699098,699415,699424,699444,699490,699517,700163,700628,700923,701273,701398,703923,704203,704261
+/hadoop/core/trunk:697306,698176,699056,699098,699415,699424,699444,699490,699517,700163,700628,700923,701273,701398,703923,704203,704261,704701

Modified: hadoop/core/branches/branch-0.19/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/CHANGES.txt?rev=704702&r1=704701&r2=704702&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Tue Oct 14 14:50:37 2008
@@ -875,6 +875,8 @@
     HADOOP-4351. FSNamesystem.getBlockLocationsInternal throws
     ArrayIndexOutOfBoundsException. (hairong)
 
+    HADOOP-4292. Do not support append() for LocalFileSystem. (hairong)
+
 Release 0.18.1 - 2008-09-17
 
   IMPROVEMENTS

Modified: hadoop/core/branches/branch-0.19/src/core/org/apache/hadoop/fs/ChecksumFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/core/org/apache/hadoop/fs/ChecksumFileSystem.java?rev=704702&r1=704701&r2=704702&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/core/org/apache/hadoop/fs/ChecksumFileSystem.java
(original)
+++ hadoop/core/branches/branch-0.19/src/core/org/apache/hadoop/fs/ChecksumFileSystem.java
Tue Oct 14 14:50:37 2008
@@ -276,6 +276,12 @@
         new ChecksumFSInputChecker(this, f, bufferSize));
   }
 
+  /** {@inheritDoc} */
+  public FSDataOutputStream append(Path f, int bufferSize,
+      Progressable progress) throws IOException {
+    throw new IOException("Not supported");
+  }
+
   /**
    * Calculated the length of the checksum file in bytes.
    * @param size the length of the data file in bytes

Modified: hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/fs/TestLocalFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/fs/TestLocalFileSystem.java?rev=704702&r1=704701&r2=704702&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/fs/TestLocalFileSystem.java
(original)
+++ hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/fs/TestLocalFileSystem.java
Tue Oct 14 14:50:37 2008
@@ -153,60 +153,4 @@
     assertEquals(path.makeQualified(fs), status.getPath());
     cleanupFile(fs, path);
   }
-
-  /* Renaming this in order to temporarily disable the test
-   * until is append() is fixed for LocalFileSystem. See 
-   * HADOOP-4292.  
-   */
-  public void disabledTestAppend() throws IOException {
-    
-    Configuration conf = new Configuration();
-    final String dir = TEST_ROOT_DIR + "/append";
-    LocalFileSystem fs = FileSystem.getLocal(conf);
-
-    //normal case
-    {
-      Path f = new Path(dir, "f");
-      FSDataOutputStream out = fs.create(f);
-      out.writeBytes("something");
-      out.close();
-      assertEquals("something", readFile(fs, f));
-  
-      out = fs.append(f);
-      out.writeBytes(" more");
-      out.close();
-      assertEquals("something more", readFile(fs, f));
-  
-      out = fs.append(f);
-      out.writeBytes(" and more");
-      out.close();
-      assertEquals("something more and more", readFile(fs, f));
-
-      cleanupFile(fs, f);
-    }
-
-    //file not found case
-    {
-      Path f = new Path(dir, "fileNotFound");
-      try {
-        fs.append(f);
-        assertTrue(false);
-      }
-      catch(FileNotFoundException e) {
-        System.out.println("good: " + e);
-      }
-    }
-
-    //append to dir case
-    {
-      Path f = new Path(dir);
-      try {
-        fs.append(f);
-        assertTrue(false);
-      }
-      catch(IOException e) {
-        System.out.println("good: " + e);
-      }
-    }
-  }
 }



Mime
View raw message