Repository: hadoop Updated Branches: refs/heads/branch-2 995f9809c -> e2803f5a5
HDFS-7741. Remove unnecessary synchronized in FSDataInputStream and HdfsDataInputStream. (yliu) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e2803f5a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e2803f5a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e2803f5a Branch: refs/heads/branch-2 Commit: e2803f5a5103119388bc8cfddeb7616e6b33f1ca Parents: 995f980 Author: yliu <[email protected]> Authored: Fri Feb 6 06:29:52 2015 +0800 Committer: yliu <[email protected]> Committed: Fri Feb 6 06:29:52 2015 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/fs/FSDataInputStream.java | 2 +- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/client/HdfsDataInputStream.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e2803f5a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataInputStream.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataInputStream.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataInputStream.java index c8609d4..6d39d1e 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataInputStream.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataInputStream.java @@ -58,7 +58,7 @@ public class FSDataInputStream extends DataInputStream * @param desired offset to seek to */ @Override - public synchronized void seek(long desired) throws IOException { + public void seek(long desired) throws IOException { ((Seekable)in).seek(desired); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/e2803f5a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index fe9ddb6..011087e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -569,6 +569,9 @@ Release 2.7.0 - UNRELEASED HDFS-7698. Fix locking on HDFS read statistics and add a method for clearing them. (Colin P. McCabe via yliu) + HDFS-7741. Remove unnecessary synchronized in FSDataInputStream and + HdfsDataInputStream. (yliu) + Release 2.6.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/e2803f5a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/client/HdfsDataInputStream.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/client/HdfsDataInputStream.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/client/HdfsDataInputStream.java index 72c57a8..e8ac686 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/client/HdfsDataInputStream.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/client/HdfsDataInputStream.java @@ -83,7 +83,7 @@ public class HdfsDataInputStream extends FSDataInputStream { /** * Get the collection of blocks that has already been located. */ - public synchronized List<LocatedBlock> getAllBlocks() throws IOException { + public List<LocatedBlock> getAllBlocks() throws IOException { return getDFSInputStream().getAllBlocks(); }
