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 ha...@apache.org on 2008/10/14 23:59:18 UTC
svn commit: r704708 - in /hadoop/core/branches/branch-0.18: ./ CHANGES.txt
src/core/org/apache/hadoop/fs/ChecksumFileSystem.java
src/test/org/apache/hadoop/fs/TestLocalFileSystem.java
Author: hairong
Date: Tue Oct 14 14:59:18 2008
New Revision: 704708
URL: http://svn.apache.org/viewvc?rev=704708&view=rev
Log:
Merge -r 704700:704701 from trunk to main to move the changelog of HADOOP-4292.
Modified:
hadoop/core/branches/branch-0.18/ (props changed)
hadoop/core/branches/branch-0.18/CHANGES.txt (contents, props changed)
hadoop/core/branches/branch-0.18/src/core/org/apache/hadoop/fs/ChecksumFileSystem.java
hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/fs/TestLocalFileSystem.java
Propchange: hadoop/core/branches/branch-0.18/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 14 14:59:18 2008
@@ -1 +1 @@
-/hadoop/core/trunk:699517,700163
+/hadoop/core/trunk:699517,700163,704701
Modified: hadoop/core/branches/branch-0.18/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=704708&r1=704707&r2=704708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Tue Oct 14 14:59:18 2008
@@ -26,6 +26,8 @@
HADOOP-4403. Make TestLeaseRecovery and TestFileCreation more robust.
(szetszwo)
+ HADOOP-4292. Do not support append() for LocalFileSystem. (hairong)
+
NEW FEATURES
HADOOP-2421. Add jdiff output to documentation, listing all API
Propchange: hadoop/core/branches/branch-0.18/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 14 14:59:18 2008
@@ -1 +1 @@
-/hadoop/core/trunk/CHANGES.txt:699517,700163,700923
+/hadoop/core/trunk/CHANGES.txt:699517,700163,700923,704701
Modified: hadoop/core/branches/branch-0.18/src/core/org/apache/hadoop/fs/ChecksumFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/core/org/apache/hadoop/fs/ChecksumFileSystem.java?rev=704708&r1=704707&r2=704708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/core/org/apache/hadoop/fs/ChecksumFileSystem.java (original)
+++ hadoop/core/branches/branch-0.18/src/core/org/apache/hadoop/fs/ChecksumFileSystem.java Tue Oct 14 14:59:18 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.18/src/test/org/apache/hadoop/fs/TestLocalFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/fs/TestLocalFileSystem.java?rev=704708&r1=704707&r2=704708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/fs/TestLocalFileSystem.java (original)
+++ hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/fs/TestLocalFileSystem.java Tue Oct 14 14:59:18 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);
- }
- }
- }
}