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 vi...@apache.org on 2015/06/10 07:37:45 UTC
[2/2] hadoop git commit: HADOOP-7817. RawLocalFileSystem.append()
should give FSDataOutputStream with accurate .getPos() (Contributed by kanaka
kumar avvaru)
HADOOP-7817. RawLocalFileSystem.append() should give FSDataOutputStream with accurate .getPos() (Contributed by kanaka kumar avvaru)
(cherry picked from commit 48ca23def1d1c28448a65238814070e79c8f4c4e)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d21bc811
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d21bc811
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d21bc811
Branch: refs/heads/branch-2
Commit: d21bc811d82f685b0a1338bc513d9a925d305a17
Parents: 2d67dff
Author: Vinayakumar B <vi...@apache.org>
Authored: Wed Jun 10 11:05:58 2015 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Wed Jun 10 11:07:04 2015 +0530
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 ++
.../apache/hadoop/fs/RawLocalFileSystem.java | 6 ++--
.../apache/hadoop/fs/TestLocalFileSystem.java | 35 ++++++++++++++++++++
3 files changed, 42 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d21bc811/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 06d4873..d67f7b7 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -359,6 +359,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-12073. Azure FileSystem PageBlobInputStream does not return -1 on
EOF. (Ivan Mitic via cnauroth)
+ HADOOP-7817. RawLocalFileSystem.append() should give FSDataOutputStream
+ with accurate .getPos() (kanaka kumar avvaru via vinayakumarb)
+
Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d21bc811/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
index 1aea1ba..c4ef5db 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
@@ -264,11 +264,13 @@ public class RawLocalFileSystem extends FileSystem {
if (!exists(f)) {
throw new FileNotFoundException("File " + f + " not found");
}
- if (getFileStatus(f).isDirectory()) {
+ FileStatus status = getFileStatus(f);
+ if (status.isDirectory()) {
throw new IOException("Cannot append to a diretory (=" + f + " )");
}
return new FSDataOutputStream(new BufferedOutputStream(
- createOutputStreamWithMode(f, true, null), bufferSize), statistics);
+ createOutputStreamWithMode(f, true, null), bufferSize), statistics,
+ status.getLen());
}
@Override
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d21bc811/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java
index 2203fff..21d5c48 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java
@@ -556,4 +556,39 @@ public class TestLocalFileSystem {
assertEquals("resolvePath did not strip fragment from Path", pathQualified,
resolved);
}
+
+ @Test
+ public void testAppendSetsPosCorrectly() throws Exception {
+ FileSystem fs = fileSys.getRawFileSystem();
+ Path file = new Path(TEST_ROOT_DIR, "test-append");
+
+ fs.delete(file, true);
+ FSDataOutputStream out = fs.create(file);
+
+ try {
+ out.write("text1".getBytes());
+ } finally {
+ out.close();
+ }
+
+ // Verify the position
+ out = fs.append(file);
+ try {
+ assertEquals(5, out.getPos());
+ out.write("text2".getBytes());
+ } finally {
+ out.close();
+ }
+
+ // Verify the content
+ FSDataInputStream in = fs.open(file);
+ try {
+ byte[] buf = new byte[in.available()];
+ in.readFully(buf);
+ assertEquals("text1text2", new String(buf));
+ } finally {
+ in.close();
+ }
+ }
+
}