Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-10772. Reduce byte/string conversions for get listing. Contributed by Daryn Sharp. 

(cherry picked from commit a1f3293762)
This commit is contained in:
Kihwal Lee 2016-08-24 15:25:33 -05:00
parent e31745e281
commit ba3257baf5
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirStatAndListingOp.java
View File

@ -23,6 +23,7 @@
import org.apache.hadoop.fs.DirectoryListingStartAfterNotFoundException; import org.apache.hadoop.fs.DirectoryListingStartAfterNotFoundException;
import org.apache.hadoop.fs.FileEncryptionInfo; import org.apache.hadoop.fs.FileEncryptionInfo;
import org.apache.hadoop.fs.InvalidPathException; 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.FsAction;
import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.fs.QuotaUsage; import org.apache.hadoop.fs.QuotaUsage;
@ -50,7 +51,6 @@
class FSDirStatAndListingOp { class FSDirStatAndListingOp {
static DirectoryListing getListingInt(FSDirectory fsd, final String srcArg, static DirectoryListing getListingInt(FSDirectory fsd, final String srcArg,
byte[] startAfter, boolean needLocation) throws IOException { byte[] startAfter, boolean needLocation) throws IOException {
final String startAfterString = DFSUtil.bytes2String(startAfter);
String src = null; String src = null;
final INodesInPath iip; final INodesInPath iip;
@ -63,16 +63,20 @@ static DirectoryListing getListingInt(FSDirectory fsd, final String srcArg,
iip = fsd.getINodesInPath(src, true); iip = fsd.getINodesInPath(src, true);
} }
// Get file name when startAfter is an INodePath // Get file name when startAfter is an INodePath. This is not the
if (FSDirectory.isReservedName(startAfterString)) { // common case so avoid any unnecessary processing unless required.
try { if (startAfter.length > 0 && startAfter[0] == Path.SEPARATOR_CHAR) {
String tmp = FSDirectory.resolvePath(startAfterString, fsd); final String startAfterString = DFSUtil.bytes2String(startAfter);
byte[][] regularPath = INode.getPathComponents(tmp); if (FSDirectory.isReservedName(startAfterString)) {
startAfter = regularPath[regularPath.length - 1]; try {
} catch (IOException e) { byte[][] components = INode.getPathComponents(startAfterString);
// Possibly the inode is deleted components = FSDirectory.resolveComponents(components, fsd);
throw new DirectoryListingStartAfterNotFoundException( startAfter = components[components.length - 1];
"Can't find startAfter " + startAfterString); } catch (IOException e) {
// Possibly the inode is deleted
throw new DirectoryListingStartAfterNotFoundException(
"Can't find startAfter " + startAfterString);
}
} }
} }