JohnZZGithub commented on a change in pull request #2185:
URL: https://github.com/apache/hadoop/pull/2185#discussion_r472385404
##########
File path:
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/InodeTree.java
##########
@@ -646,102 +714,222 @@ boolean isInternalDir() {
}
/**
- * Resolve the pathname p relative to root InodeDir
+ * Resolve the pathname p relative to root InodeDir.
* @param p - input path
* @param resolveLastComponent
* @return ResolveResult which allows further resolution of the remaining
path
* @throws FileNotFoundException
*/
ResolveResult<T> resolve(final String p, final boolean resolveLastComponent)
throws FileNotFoundException {
- String[] path = breakIntoPathComponents(p);
- if (path.length <= 1) { // special case for when path is "/"
- T targetFs = root.isInternalDir() ?
- getRootDir().getInternalDirFs() :
getRootLink().getTargetFileSystem();
- ResolveResult<T> res = new ResolveResult<T>(ResultKind.INTERNAL_DIR,
- targetFs, root.fullPath, SlashPath);
- return res;
- }
+ ResolveResult<T> resolveResult = null;
+ resolveResult = getResolveResultFromCache(p, resolveLastComponent);
+ if (resolveResult != null) {
+ return resolveResult;
+ }
+
+ try {
+ String[] path = breakIntoPathComponents(p);
+ if (path.length <= 1) { // special case for when path is "/"
+ T targetFs = root.isInternalDir() ?
+ getRootDir().getInternalDirFs()
+ : getRootLink().getTargetFileSystem();
+ resolveResult = new ResolveResult<T>(ResultKind.INTERNAL_DIR,
+ targetFs, root.fullPath, SlashPath);
+ return resolveResult;
+ }
- /**
- * linkMergeSlash has been configured. The root of this mount table has
- * been linked to the root directory of a file system.
- * The first non-slash path component should be name of the mount table.
- */
- if (root.isLink()) {
- Path remainingPath;
- StringBuilder remainingPathStr = new StringBuilder();
- // ignore first slash
- for (int i = 1; i < path.length; i++) {
- remainingPathStr.append("/").append(path[i]);
+ /**
+ * linkMergeSlash has been configured. The root of this mount table has
+ * been linked to the root directory of a file system.
+ * The first non-slash path component should be name of the mount table.
+ */
+ if (root.isLink()) {
+ Path remainingPath;
+ StringBuilder remainingPathStr = new StringBuilder();
+ // ignore first slash
+ for (int i = 1; i < path.length; i++) {
+ remainingPathStr.append("/").append(path[i]);
+ }
+ remainingPath = new Path(remainingPathStr.toString());
+ resolveResult = new ResolveResult<T>(ResultKind.EXTERNAL_DIR,
+ getRootLink().getTargetFileSystem(), root.fullPath, remainingPath);
+ return resolveResult;
}
- remainingPath = new Path(remainingPathStr.toString());
- ResolveResult<T> res = new ResolveResult<T>(ResultKind.EXTERNAL_DIR,
- getRootLink().getTargetFileSystem(), root.fullPath, remainingPath);
- return res;
- }
- Preconditions.checkState(root.isInternalDir());
- INodeDir<T> curInode = getRootDir();
+ Preconditions.checkState(root.isInternalDir());
+ INodeDir<T> curInode = getRootDir();
- int i;
- // ignore first slash
- for (i = 1; i < path.length - (resolveLastComponent ? 0 : 1); i++) {
- INode<T> nextInode = curInode.resolveInternal(path[i]);
- if (nextInode == null) {
- if (hasFallbackLink()) {
- return new ResolveResult<T>(ResultKind.EXTERNAL_DIR,
- getRootFallbackLink().getTargetFileSystem(),
- root.fullPath, new Path(p));
- } else {
- StringBuilder failedAt = new StringBuilder(path[0]);
- for (int j = 1; j <= i; ++j) {
- failedAt.append('/').append(path[j]);
+ // Try to resolve path in the regex mount point
+ resolveResult = tryResolveInRegexMountpoint(p, resolveLastComponent);
+ if (resolveResult != null) {
+ return resolveResult;
+ }
+
+ int i;
+ // ignore first slash
+ for (i = 1; i < path.length - (resolveLastComponent ? 0 : 1); i++) {
+ INode<T> nextInode = curInode.resolveInternal(path[i]);
+ if (nextInode == null) {
+ if (hasFallbackLink()) {
+ resolveResult = new ResolveResult<T>(ResultKind.EXTERNAL_DIR,
+ getRootFallbackLink().getTargetFileSystem(), root.fullPath,
+ new Path(p));
+ return resolveResult;
+ } else {
+ StringBuilder failedAt = new StringBuilder(path[0]);
+ for (int j = 1; j <= i; ++j) {
+ failedAt.append('/').append(path[j]);
+ }
+ throw (new FileNotFoundException(
+ "File/Directory does not exist: " + failedAt.toString()));
}
- throw (new FileNotFoundException(
- "File/Directory does not exist: " + failedAt.toString()));
}
- }
- if (nextInode.isLink()) {
- final INodeLink<T> link = (INodeLink<T>) nextInode;
- final Path remainingPath;
- if (i >= path.length - 1) {
- remainingPath = SlashPath;
- } else {
- StringBuilder remainingPathStr = new StringBuilder("/" + path[i +
1]);
- for (int j = i + 2; j < path.length; ++j) {
- remainingPathStr.append('/').append(path[j]);
+ if (nextInode.isLink()) {
+ final INodeLink<T> link = (INodeLink<T>) nextInode;
+ final Path remainingPath;
+ if (i >= path.length - 1) {
+ remainingPath = SlashPath;
+ } else {
+ StringBuilder remainingPathStr =
+ new StringBuilder("/" + path[i + 1]);
+ for (int j = i + 2; j < path.length; ++j) {
+ remainingPathStr.append('/').append(path[j]);
+ }
+ remainingPath = new Path(remainingPathStr.toString());
}
- remainingPath = new Path(remainingPathStr.toString());
+ resolveResult = new ResolveResult<T>(ResultKind.EXTERNAL_DIR,
+ link.getTargetFileSystem(), nextInode.fullPath, remainingPath);
+ return resolveResult;
+ } else if (nextInode.isInternalDir()) {
+ curInode = (INodeDir<T>) nextInode;
}
- final ResolveResult<T> res =
- new ResolveResult<T>(ResultKind.EXTERNAL_DIR,
- link.getTargetFileSystem(), nextInode.fullPath, remainingPath);
- return res;
- } else if (nextInode.isInternalDir()) {
- curInode = (INodeDir<T>) nextInode;
+ }
+
+ // We have resolved to an internal dir in mount table.
+ Path remainingPath;
+ if (resolveLastComponent) {
+ remainingPath = SlashPath;
+ } else {
+ // note we have taken care of when path is "/" above
+ // for internal dirs rem-path does not start with / since the lookup
+ // that follows will do a children.get(remaningPath) and will have to
+ // strip-out the initial /
+ StringBuilder remainingPathStr = new StringBuilder("/" + path[i]);
+ for (int j = i + 1; j < path.length; ++j) {
+ remainingPathStr.append('/').append(path[j]);
+ }
+ remainingPath = new Path(remainingPathStr.toString());
+ }
+ resolveResult = new ResolveResult<T>(ResultKind.INTERNAL_DIR,
+ curInode.getInternalDirFs(), curInode.fullPath, remainingPath);
+ return resolveResult;
+ } finally {
+ if (pathResolutionCacheCapacity > 0 && resolveResult != null) {
+ addResolveResultToCache(p, resolveLastComponent, resolveResult);
}
}
+ }
- // We have resolved to an internal dir in mount table.
- Path remainingPath;
- if (resolveLastComponent) {
- remainingPath = SlashPath;
- } else {
- // note we have taken care of when path is "/" above
- // for internal dirs rem-path does not start with / since the lookup
- // that follows will do a children.get(remaningPath) and will have to
- // strip-out the initial /
- StringBuilder remainingPathStr = new StringBuilder("/" + path[i]);
- for (int j = i + 1; j < path.length; ++j) {
- remainingPathStr.append('/').append(path[j]);
+ /**
+ * Walk through all regex mount points to see
+ * whether the path match any regex expressions.
+ *
+ * @param srcPath
+ * @param resolveLastComponent
+ * @return
+ */
+ protected ResolveResult<T> tryResolveInRegexMountpoint(final String srcPath,
+ final boolean resolveLastComponent) {
+ for (RegexMountPoint regexMountPoint : regexMountPointList) {
+ ResolveResult resolveResult =
+ regexMountPoint.resolve(srcPath, resolveLastComponent);
+ if (resolveResult != null) {
+ return resolveResult;
}
- remainingPath = new Path(remainingPathStr.toString());
}
- final ResolveResult<T> res =
- new ResolveResult<T>(ResultKind.INTERNAL_DIR,
- curInode.getInternalDirFs(), curInode.fullPath, remainingPath);
- return res;
+ return null;
+ }
+
+ /**
+ * Build resolve result return to caller.
+ *
+ * @param resultKind
+ * @param resolvedPathStr
+ * @param targetOfResolvedPathStr
+ * @param remainingPath
+ * @return
+ */
+ protected ResolveResult<T> buildResolveResultForRegexMountPoint(
+ ResultKind resultKind, String resolvedPathStr,
+ String targetOfResolvedPathStr, Path remainingPath) {
+ try {
+ T targetFs = getTargetFileSystem(new URI(targetOfResolvedPathStr));
+ return new ResolveResult<T>(resultKind, targetFs, resolvedPathStr,
+ remainingPath);
+ } catch (IOException ex) {
+ LOGGER.error(String.format(
+ "Got Exception while build resolve result."
+ + " ResultKind:%s, resolvedPathStr:%s,"
+ + " targetOfResolvedPathStr:%s, remainingPath:%s,"
+ + " will return null.",
+ resultKind, resolvedPathStr, targetOfResolvedPathStr, remainingPath),
+ ex);
+ return null;
+ } catch (URISyntaxException uex) {
+ LOGGER.error(String.format(
+ "Got Exception while build resolve result."
+ + " ResultKind:%s, resolvedPathStr:%s,"
+ + " targetOfResolvedPathStr:%s, remainingPath:%s,"
+ + " will return null.",
+ resultKind, resolvedPathStr, targetOfResolvedPathStr, remainingPath),
+ uex);
+ return null;
+ }
+ }
+
+ /**
+ * Return resolution cache capacity.
+ *
+ * @return
+ */
+ public int getPathResolutionCacheCapacity() {
+ return pathResolutionCacheCapacity;
+ }
+
Review comment:
Sure, make sense.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: common-issues-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-issues-h...@hadoop.apache.org
