Repository: hadoop Updated Branches: refs/heads/branch-2.8 1c946a266 -> 16c166249
HDFS-10772. Reduce byte/string conversions for get listing. Contributed by Daryn Sharp. (cherry picked from commit a1f3293762dddb0ca953d1145f5b53d9086b25b8) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/16c16624 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/16c16624 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/16c16624 Branch: refs/heads/branch-2.8 Commit: 16c166249cfd7743c634e8f83556462c8b39e1ff Parents: 1c946a2 Author: Kihwal Lee <[email protected]> Authored: Fri Sep 2 12:32:34 2016 -0500 Committer: Kihwal Lee <[email protected]> Committed: Fri Sep 2 12:32:34 2016 -0500 ---------------------------------------------------------------------- .../server/namenode/FSDirStatAndListingOp.java | 26 +++++++++++--------- 1 file changed, 15 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/16c16624/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirStatAndListingOp.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirStatAndListingOp.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirStatAndListingOp.java index 9b0e5f7..7761f06 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirStatAndListingOp.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirStatAndListingOp.java @@ -23,6 +23,7 @@ import org.apache.hadoop.fs.ContentSummary; import org.apache.hadoop.fs.DirectoryListingStartAfterNotFoundException; import org.apache.hadoop.fs.FileEncryptionInfo; import org.apache.hadoop.fs.InvalidPathException; +import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.permission.FsAction; import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.fs.QuotaUsage; @@ -50,7 +51,6 @@ import static org.apache.hadoop.util.Time.now; class FSDirStatAndListingOp { static DirectoryListing getListingInt(FSDirectory fsd, final String srcArg, byte[] startAfter, boolean needLocation) throws IOException { - final String startAfterString = DFSUtil.bytes2String(startAfter); String src = null; final INodesInPath iip; @@ -63,16 +63,20 @@ class FSDirStatAndListingOp { iip = fsd.getINodesInPath(src, true); } - // Get file name when startAfter is an INodePath - if (FSDirectory.isReservedName(startAfterString)) { - try { - String tmp = FSDirectory.resolvePath(startAfterString, fsd); - byte[][] regularPath = INode.getPathComponents(tmp); - startAfter = regularPath[regularPath.length - 1]; - } catch (IOException e) { - // Possibly the inode is deleted - throw new DirectoryListingStartAfterNotFoundException( - "Can't find startAfter " + startAfterString); + // Get file name when startAfter is an INodePath. This is not the + // common case so avoid any unnecessary processing unless required. + if (startAfter.length > 0 && startAfter[0] == Path.SEPARATOR_CHAR) { + final String startAfterString = DFSUtil.bytes2String(startAfter); + if (FSDirectory.isReservedName(startAfterString)) { + try { + byte[][] components = INode.getPathComponents(startAfterString); + components = FSDirectory.resolveComponents(components, fsd); + startAfter = components[components.length - 1]; + } catch (IOException e) { + // Possibly the inode is deleted + throw new DirectoryListingStartAfterNotFoundException( + "Can't find startAfter " + startAfterString); + } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
