HADOOP-13722. Code cleanup -- ViewFileSystem and InodeTree. Contributed by Manoj Govindassamy.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0f4afc81 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0f4afc81 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0f4afc81 Branch: refs/heads/HADOOP-13070 Commit: 0f4afc81009129bbee89d5b6cf22c8dda612d223 Parents: 412c4c9 Author: Andrew Wang <w...@apache.org> Authored: Mon Oct 17 13:15:11 2016 -0700 Committer: Andrew Wang <w...@apache.org> Committed: Mon Oct 17 13:15:11 2016 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/fs/viewfs/InodeTree.java | 206 +++++++++---------- .../apache/hadoop/fs/viewfs/ViewFileSystem.java | 91 ++++---- .../hadoop/fs/viewfs/TestViewFsConfig.java | 42 ++-- 3 files changed, 155 insertions(+), 184 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0f4afc81/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/InodeTree.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/InodeTree.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/InodeTree.java index 8c42cdf..a485a3b 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/InodeTree.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/InodeTree.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -36,47 +36,45 @@ import org.apache.hadoop.fs.UnsupportedFileSystemException; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.util.StringUtils; - /** * InodeTree implements a mount-table as a tree of inodes. * It is used to implement ViewFs and ViewFileSystem. * In order to use it the caller must subclass it and implement * the abstract methods {@link #getTargetFileSystem(INodeDir)}, etc. - * + * * The mountable is initialized from the config variables as * specified in {@link ViewFs} * * @param <T> is AbstractFileSystem or FileSystem - * - * The three main methods are - * {@link #InodeTreel(Configuration)} // constructor + * + * The two main methods are * {@link #InodeTree(Configuration, String)} // constructor * {@link #resolve(String, boolean)} */ @InterfaceAudience.Private -@InterfaceStability.Unstable +@InterfaceStability.Unstable abstract class InodeTree<T> { - static enum ResultKind {isInternalDir, isExternalDir;}; + enum ResultKind { + INTERNAL_DIR, + EXTERNAL_DIR + } + static final Path SlashPath = new Path("/"); - - final INodeDir<T> root; // the root of the mount table - - final String homedirPrefix; // the homedir config value for this mount table - - List<MountPoint<T>> mountPoints = new ArrayList<MountPoint<T>>(); - - + private final INodeDir<T> root; // the root of the mount table + private final String homedirPrefix; // the homedir for this mount table + private List<MountPoint<T>> mountPoints = new ArrayList<MountPoint<T>>(); + static class MountPoint<T> { String src; INodeLink<T> target; + MountPoint(String srcPath, INodeLink<T> mountLink) { src = srcPath; target = mountLink; } - } - + /** * Breaks file path into component names. * @param path @@ -84,18 +82,19 @@ abstract class InodeTree<T> { */ static String[] breakIntoPathComponents(final String path) { return path == null ? null : path.split(Path.SEPARATOR); - } - + } + /** * Internal class for inode tree * @param <T> */ abstract static class INode<T> { final String fullPath; // the full path to the root + public INode(String pathToNode, UserGroupInformation aUgi) { fullPath = pathToNode; } - }; + } /** * Internal class to represent an internal dir of the mount table @@ -105,37 +104,28 @@ abstract class InodeTree<T> { final Map<String,INode<T>> children = new HashMap<String,INode<T>>(); T InodeDirFs = null; // file system of this internal directory of mountT boolean isRoot = false; - + INodeDir(final String pathToNode, final UserGroupInformation aUgi) { super(pathToNode, aUgi); } - INode<T> resolve(final String pathComponent) throws FileNotFoundException { - final INode<T> result = resolveInternal(pathComponent); - if (result == null) { - throw new FileNotFoundException(); - } - return result; - } - INode<T> resolveInternal(final String pathComponent) { return children.get(pathComponent); } - + INodeDir<T> addDir(final String pathComponent, - final UserGroupInformation aUgi) - throws FileAlreadyExistsException { + final UserGroupInformation aUgi) throws FileAlreadyExistsException { if (children.containsKey(pathComponent)) { throw new FileAlreadyExistsException(); } - final INodeDir<T> newDir = new INodeDir<T>(fullPath+ (isRoot ? "" : "/") + - pathComponent, aUgi); + final INodeDir<T> newDir = new INodeDir<T>(fullPath + + (isRoot ? "" : "/") + pathComponent, aUgi); children.put(pathComponent, newDir); return newDir; } - + void addLink(final String pathComponent, final INodeLink<T> link) - throws FileAlreadyExistsException { + throws FileAlreadyExistsException { if (children.containsKey(pathComponent)) { throw new FileAlreadyExistsException(); } @@ -144,14 +134,14 @@ abstract class InodeTree<T> { } /** - * In internal class to represent a mount link + * An internal class to represent a mount link. * A mount link can be single dir link or a merge dir link. * A merge dir link is a merge (junction) of links to dirs: - * example : <merge of 2 dirs + * example : merge of 2 dirs * /users -> hdfs:nn1//users * /users -> hdfs:nn2//users - * + * * For a merge, each target is checked to be dir when created but if target * is changed later it is then ignored (a dir with null entries) */ @@ -159,9 +149,9 @@ abstract class InodeTree<T> { final boolean isMergeLink; // true if MergeLink final URI[] targetDirLinkList; final T targetFileSystem; // file system object created from the link. - + /** - * Construct a mergeLink + * Construct a mergeLink. */ INodeLink(final String pathToNode, final UserGroupInformation aUgi, final T targetMergeFs, final URI[] aTargetDirLinkList) { @@ -170,9 +160,9 @@ abstract class InodeTree<T> { targetDirLinkList = aTargetDirLinkList; isMergeLink = true; } - + /** - * Construct a simple link (i.e. not a mergeLink) + * Construct a simple link (i.e. not a mergeLink). */ INodeLink(final String pathToNode, final UserGroupInformation aUgi, final T targetFs, final URI aTargetDirLink) { @@ -182,38 +172,36 @@ abstract class InodeTree<T> { targetDirLinkList[0] = aTargetDirLink; isMergeLink = false; } - + /** - * Get the target of the link - * If a merge link then it returned as "," separated URI list. + * Get the target of the link. If a merge link then it returned + * as "," separated URI list. */ Path getTargetLink() { - // is merge link - use "," as separator between the merged URIs - //String result = targetDirLinkList[0].toString(); StringBuilder result = new StringBuilder(targetDirLinkList[0].toString()); - for (int i=1; i < targetDirLinkList.length; ++i) { + // If merge link, use "," as separator between the merged URIs + for (int i = 1; i < targetDirLinkList.length; ++i) { result.append(',').append(targetDirLinkList[i].toString()); } return new Path(result.toString()); } } - private void createLink(final String src, final String target, final boolean isLinkMerge, final UserGroupInformation aUgi) throws URISyntaxException, IOException, - FileAlreadyExistsException, UnsupportedFileSystemException { + FileAlreadyExistsException, UnsupportedFileSystemException { // Validate that src is valid absolute path - final Path srcPath = new Path(src); + final Path srcPath = new Path(src); if (!srcPath.isAbsoluteAndSchemeAuthorityNull()) { - throw new IOException("ViewFs:Non absolute mount name in config:" + src); + throw new IOException("ViewFs: Non absolute mount name in config:" + src); } - + final String[] srcPaths = breakIntoPathComponents(src); INodeDir<T> curInode = root; int i; // Ignore first initial slash, process all except last component - for (i = 1; i < srcPaths.length-1; i++) { + for (i = 1; i < srcPaths.length - 1; i++) { final String iPath = srcPaths[i]; INode<T> nextInode = curInode.resolveInternal(iPath); if (nextInode == null) { @@ -226,11 +214,11 @@ abstract class InodeTree<T> { throw new FileAlreadyExistsException("Path " + nextInode.fullPath + " already exists as link"); } else { - assert(nextInode instanceof INodeDir); + assert (nextInode instanceof INodeDir); curInode = (INodeDir<T>) nextInode; } } - + // Now process the last component // Add the link in 2 cases: does not exist or a link exists String iPath = srcPaths[i];// last component @@ -241,9 +229,9 @@ abstract class InodeTree<T> { strB.append('/').append(srcPaths[j]); } throw new FileAlreadyExistsException("Path " + strB + - " already exists as dir; cannot create link here"); + " already exists as dir; cannot create link here"); } - + final INodeLink<T> newLink; final String fullPath = curInode.fullPath + (curInode == root ? "" : "/") + iPath; @@ -263,25 +251,21 @@ abstract class InodeTree<T> { curInode.addLink(iPath, newLink); mountPoints.add(new MountPoint<T>(src, newLink)); } - - /** - * Below the "public" methods of InodeTree - */ - + /** * The user of this class must subclass and implement the following * 3 abstract methods. - * @throws IOException + * @throws IOException */ protected abstract T getTargetFileSystem(final URI uri) - throws UnsupportedFileSystemException, URISyntaxException, IOException; - + throws UnsupportedFileSystemException, URISyntaxException, IOException; + protected abstract T getTargetFileSystem(final INodeDir<T> dir) - throws URISyntaxException; - + throws URISyntaxException; + protected abstract T getTargetFileSystem(final URI[] mergeFsURIList) - throws UnsupportedFileSystemException, URISyntaxException; - + throws UnsupportedFileSystemException, URISyntaxException; + /** * Create Inode Tree from the specified mount-table specified in Config * @param config - the mount table keys are prefixed with @@ -294,7 +278,7 @@ abstract class InodeTree<T> { */ protected InodeTree(final Configuration config, final String viewName) throws UnsupportedFileSystemException, URISyntaxException, - FileAlreadyExistsException, IOException { + FileAlreadyExistsException, IOException { String vName = viewName; if (vName == null) { vName = Constants.CONFIG_VIEWFS_DEFAULT_MOUNT_TABLE; @@ -303,9 +287,9 @@ abstract class InodeTree<T> { root = new INodeDir<T>("/", UserGroupInformation.getCurrentUser()); root.InodeDirFs = getTargetFileSystem(root); root.isRoot = true; - - final String mtPrefix = Constants.CONFIG_VIEWFS_PREFIX + "." + - vName + "."; + + final String mtPrefix = Constants.CONFIG_VIEWFS_PREFIX + "." + + vName + "."; final String linkPrefix = Constants.CONFIG_VIEWFS_LINK + "."; final String linkMergePrefix = Constants.CONFIG_VIEWFS_LINK_MERGE + "."; boolean gotMountTableEntry = false; @@ -325,18 +309,17 @@ abstract class InodeTree<T> { // ignore - we set home dir from config continue; } else { - throw new IOException( - "ViewFs: Cannot initialize: Invalid entry in Mount table in config: "+ - src); + throw new IOException("ViewFs: Cannot initialize: Invalid entry in " + + "Mount table in config: " + src); } final String target = si.getValue(); // link or merge link - createLink(src, target, isMergeLink, ugi); + createLink(src, target, isMergeLink, ugi); } } if (!gotMountTableEntry) { throw new IOException( "ViewFs: Cannot initialize: Empty Mount table in config for " + - "viewfs://" + vName + "/"); + "viewfs://" + vName + "/"); } } @@ -344,7 +327,7 @@ abstract class InodeTree<T> { * Resolve returns ResolveResult. * The caller can continue the resolution of the remainingPath * in the targetFileSystem. - * + * * If the input pathname leads to link to another file system then * the targetFileSystem is the one denoted by the link (except it is * file system chrooted to link target. @@ -356,7 +339,7 @@ abstract class InodeTree<T> { final T targetFileSystem; final String resolvedPath; final Path remainingPath; // to resolve in the target FileSystem - + ResolveResult(final ResultKind k, final T targetFs, final String resolveP, final Path remainingP) { kind = k; @@ -364,31 +347,30 @@ abstract class InodeTree<T> { resolvedPath = resolveP; remainingPath = remainingP; } - - // isInternalDir of path resolution completed within the mount table + + // Internal dir path resolution completed within the mount table boolean isInternalDir() { - return (kind == ResultKind.isInternalDir); + return (kind == ResultKind.INTERNAL_DIR); } } - + /** * Resolve the pathname p relative to root InodeDir * @param p - inout path - * @param resolveLastComponent + * @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 { - // TO DO: - more efficient to not split the path, but simply compare - String[] path = breakIntoPathComponents(p); + throws FileNotFoundException { + String[] path = breakIntoPathComponents(p); if (path.length <= 1) { // special case for when path is "/" - ResolveResult<T> res = - new ResolveResult<T>(ResultKind.isInternalDir, + ResolveResult<T> res = + new ResolveResult<T>(ResultKind.INTERNAL_DIR, root.InodeDirFs, root.fullPath, SlashPath); return res; } - + INodeDir<T> curInode = root; int i; // ignore first slash @@ -396,27 +378,27 @@ abstract class InodeTree<T> { INode<T> nextInode = curInode.resolveInternal(path[i]); if (nextInode == null) { StringBuilder failedAt = new StringBuilder(path[0]); - for ( int j = 1; j <=i; ++j) { + for (int j = 1; j <= i; ++j) { failedAt.append('/').append(path[j]); } - throw (new FileNotFoundException(failedAt.toString())); + throw (new FileNotFoundException(failedAt.toString())); } if (nextInode instanceof INodeLink) { final INodeLink<T> link = (INodeLink<T>) nextInode; final Path remainingPath; - if (i >= path.length-1) { + if (i >= path.length - 1) { remainingPath = SlashPath; } else { - StringBuilder remainingPathStr = new StringBuilder("/" + path[i+1]); - for (int j = i+2; j< path.length; ++j) { + 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()); } - final ResolveResult<T> res = - new ResolveResult<T>(ResultKind.isExternalDir, - link.targetFileSystem, nextInode.fullPath, remainingPath); + final ResolveResult<T> res = + new ResolveResult<T>(ResultKind.EXTERNAL_DIR, + link.targetFileSystem, nextInode.fullPath, remainingPath); return res; } else if (nextInode instanceof INodeDir) { curInode = (INodeDir<T>) nextInode; @@ -433,23 +415,23 @@ abstract class InodeTree<T> { // 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) { + for (int j = i + 1; j < path.length; ++j) { remainingPathStr.append('/').append(path[j]); } remainingPath = new Path(remainingPathStr.toString()); } - final ResolveResult<T> res = - new ResolveResult<T>(ResultKind.isInternalDir, - curInode.InodeDirFs, curInode.fullPath, remainingPath); + final ResolveResult<T> res = + new ResolveResult<T>(ResultKind.INTERNAL_DIR, + curInode.InodeDirFs, curInode.fullPath, remainingPath); return res; } - - List<MountPoint<T>> getMountPoints() { + + List<MountPoint<T>> getMountPoints() { return mountPoints; } - + /** - * + * * @return home dir value from mount table; null if no config value * was found. */ http://git-wip-us.apache.org/repos/asf/hadoop/blob/0f4afc81/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java index f6947ff..f2a91d1 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java @@ -87,10 +87,19 @@ public class ViewFileSystem extends FileSystem { final Path p) { return readOnlyMountTable(operation, p.toString()); } - + static public class MountPoint { - private Path src; // the src of the mount - private URI[] targets; // target of the mount; Multiple targets imply mergeMount + /** + * The source of the mount. + */ + private Path src; + + /** + * One or more targets of the mount. + * Multiple targets imply MergeMount. + */ + private URI[] targets; + MountPoint(Path srcPath, URI[] targetURIs) { src = srcPath; targets = targetURIs; @@ -142,19 +151,18 @@ public class ViewFileSystem extends FileSystem { /** * Return the protocol scheme for the FileSystem. - * <p/> * * @return <code>viewfs</code> */ @Override public String getScheme() { - return "viewfs"; + return FsConstants.VIEWFS_SCHEME; } /** * Called after a new FileSystem instance is constructed. * @param theUri a uri whose authority section names the host, port, etc. for - * this FileSystem + * this FileSystem * @param conf the configuration */ @Override @@ -197,8 +205,7 @@ public class ViewFileSystem extends FileSystem { } } - - + /** * Convenience Constructor for apps to call directly * @param theUri which must be that of ViewFileSystem @@ -206,7 +213,7 @@ public class ViewFileSystem extends FileSystem { * @throws IOException */ ViewFileSystem(final URI theUri, final Configuration conf) - throws IOException { + throws IOException { this(); initialize(theUri, conf); } @@ -226,8 +233,7 @@ public class ViewFileSystem extends FileSystem { } @Override - public Path resolvePath(final Path f) - throws IOException { + public Path resolvePath(final Path f) throws IOException { final InodeTree.ResolveResult<FileSystem> res; res = fsState.resolve(getUriPath(f), true); if (res.isInternalDir()) { @@ -271,8 +277,8 @@ public class ViewFileSystem extends FileSystem { @Override public FSDataOutputStream createNonRecursive(Path f, FsPermission permission, - EnumSet<CreateFlag> flags, int bufferSize, short replication, long blockSize, - Progressable progress) throws IOException { + EnumSet<CreateFlag> flags, int bufferSize, short replication, + long blockSize, Progressable progress) throws IOException { InodeTree.ResolveResult<FileSystem> res; try { res = fsState.resolve(getUriPath(f), false); @@ -280,8 +286,8 @@ public class ViewFileSystem extends FileSystem { throw readOnlyMountTable("create", f); } assert(res.remainingPath != null); - return res.targetFileSystem.createNonRecursive(res.remainingPath, permission, - flags, bufferSize, replication, blockSize, progress); + return res.targetFileSystem.createNonRecursive(res.remainingPath, + permission, flags, bufferSize, replication, blockSize, progress); } @Override @@ -302,10 +308,9 @@ public class ViewFileSystem extends FileSystem { @Override public boolean delete(final Path f, final boolean recursive) - throws AccessControlException, FileNotFoundException, - IOException { + throws AccessControlException, FileNotFoundException, IOException { InodeTree.ResolveResult<FileSystem> res = - fsState.resolve(getUriPath(f), true); + fsState.resolve(getUriPath(f), true); // If internal dir or target is a mount link (ie remainingPath is Slash) if (res.isInternalDir() || res.remainingPath == InodeTree.SlashPath) { throw readOnlyMountTable("delete", f); @@ -316,9 +321,8 @@ public class ViewFileSystem extends FileSystem { @Override @SuppressWarnings("deprecation") public boolean delete(final Path f) - throws AccessControlException, FileNotFoundException, - IOException { - return delete(f, true); + throws AccessControlException, FileNotFoundException, IOException { + return delete(f, true); } @Override @@ -339,7 +343,6 @@ public class ViewFileSystem extends FileSystem { return res.targetFileSystem.getFileChecksum(res.remainingPath); } - private static FileStatus fixFileStatus(FileStatus orig, Path qualified) throws IOException { // FileStatus#getPath is a fully qualified path relative to the root of @@ -367,7 +370,6 @@ public class ViewFileSystem extends FileSystem { : new ViewFsFileStatus(orig, qualified); } - @Override public FileStatus getFileStatus(final Path f) throws AccessControlException, FileNotFoundException, IOException { @@ -407,10 +409,10 @@ public class ViewFileSystem extends FileSystem { @Override public RemoteIterator<LocatedFileStatus>listLocatedStatus(final Path f, final PathFilter filter) throws FileNotFoundException, IOException { - final InodeTree.ResolveResult<FileSystem> res = fsState - .resolve(getUriPath(f), true); - final RemoteIterator<LocatedFileStatus> statusIter = res.targetFileSystem - .listLocatedStatus(res.remainingPath); + final InodeTree.ResolveResult<FileSystem> res = + fsState.resolve(getUriPath(f), true); + final RemoteIterator<LocatedFileStatus> statusIter = + res.targetFileSystem.listLocatedStatus(res.remainingPath); if (res.isInternalDir()) { return statusIter; @@ -449,8 +451,7 @@ public class ViewFileSystem extends FileSystem { @Override public FSDataInputStream open(final Path f, final int bufferSize) - throws AccessControlException, FileNotFoundException, - IOException { + throws AccessControlException, FileNotFoundException, IOException { InodeTree.ResolveResult<FileSystem> res = fsState.resolve(getUriPath(f), true); return res.targetFileSystem.open(res.remainingPath, bufferSize); @@ -507,8 +508,7 @@ public class ViewFileSystem extends FileSystem { @Override public void setOwner(final Path f, final String username, final String groupname) throws AccessControlException, - FileNotFoundException, - IOException { + FileNotFoundException, IOException { InodeTree.ResolveResult<FileSystem> res = fsState.resolve(getUriPath(f), true); res.targetFileSystem.setOwner(res.remainingPath, username, groupname); @@ -516,8 +516,7 @@ public class ViewFileSystem extends FileSystem { @Override public void setPermission(final Path f, final FsPermission permission) - throws AccessControlException, FileNotFoundException, - IOException { + throws AccessControlException, FileNotFoundException, IOException { InodeTree.ResolveResult<FileSystem> res = fsState.resolve(getUriPath(f), true); res.targetFileSystem.setPermission(res.remainingPath, permission); @@ -525,8 +524,7 @@ public class ViewFileSystem extends FileSystem { @Override public boolean setReplication(final Path f, final short replication) - throws AccessControlException, FileNotFoundException, - IOException { + throws AccessControlException, FileNotFoundException, IOException { InodeTree.ResolveResult<FileSystem> res = fsState.resolve(getUriPath(f), true); return res.targetFileSystem.setReplication(res.remainingPath, replication); @@ -534,8 +532,7 @@ public class ViewFileSystem extends FileSystem { @Override public void setTimes(final Path f, final long mtime, final long atime) - throws AccessControlException, FileNotFoundException, - IOException { + throws AccessControlException, FileNotFoundException, IOException { InodeTree.ResolveResult<FileSystem> res = fsState.resolve(getUriPath(f), true); res.targetFileSystem.setTimes(res.remainingPath, mtime, atime); @@ -793,8 +790,8 @@ public class ViewFileSystem extends FileSystem { return allPolicies; } - /* - * An instance of this class represents an internal dir of the viewFs + /** + * An instance of this class represents an internal dir of the viewFs * that is internal dir of the mount table. * It is a read only mount tables and create, mkdir or delete operations * are not allowed. @@ -826,8 +823,8 @@ public class ViewFileSystem extends FileSystem { static private void checkPathIsSlash(final Path f) throws IOException { if (f != InodeTree.SlashPath) { - throw new IOException ( - "Internal implementation error: expected file name to be /" ); + throw new IOException( + "Internal implementation error: expected file name to be /"); } } @@ -838,14 +835,14 @@ public class ViewFileSystem extends FileSystem { @Override public Path getWorkingDirectory() { - throw new RuntimeException ( - "Internal impl error: getWorkingDir should not have been called" ); + throw new RuntimeException( + "Internal impl error: getWorkingDir should not have been called"); } @Override public void setWorkingDirectory(final Path new_dir) { - throw new RuntimeException ( - "Internal impl error: getWorkingDir should not have been called" ); + throw new RuntimeException( + "Internal impl error: getWorkingDir should not have been called"); } @Override @@ -878,7 +875,7 @@ public class ViewFileSystem extends FileSystem { @Override public BlockLocation[] getFileBlockLocations(final FileStatus fs, - final long start, final long len) throws + final long start, final long len) throws FileNotFoundException, IOException { checkPathIsSlash(fs.getPath()); throw new FileNotFoundException("Path points to dir not a file"); @@ -1055,7 +1052,7 @@ public class ViewFileSystem extends FileSystem { @Override public void setXAttr(Path path, String name, byte[] value, - EnumSet<XAttrSetFlag> flag) throws IOException { + EnumSet<XAttrSetFlag> flag) throws IOException { checkPathIsSlash(path); throw readOnlyMountTable("setXAttr", path); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/0f4afc81/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsConfig.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsConfig.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsConfig.java index 75b329c..895ae0c 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsConfig.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsConfig.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,49 +22,41 @@ import java.net.URI; import java.net.URISyntaxException; import org.apache.hadoop.conf.Configuration; - import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.FileAlreadyExistsException; import org.apache.hadoop.fs.UnsupportedFileSystemException; -import org.apache.hadoop.fs.viewfs.ConfigUtil; -import org.apache.hadoop.fs.viewfs.InodeTree; import org.junit.Test; - public class TestViewFsConfig { - - - @Test(expected=FileAlreadyExistsException.class) + + @Test(expected = FileAlreadyExistsException.class) public void testInvalidConfig() throws IOException, URISyntaxException { Configuration conf = new Configuration(); ConfigUtil.addLink(conf, "/internalDir/linkToDir2", new Path("file:///dir2").toUri()); ConfigUtil.addLink(conf, "/internalDir/linkToDir2/linkToDir3", new Path("file:///dir3").toUri()); - - class Foo { }; - - new InodeTree<Foo>(conf, null) { + + class Foo { + } + + new InodeTree<Foo>(conf, null) { @Override - protected - Foo getTargetFileSystem(final URI uri) - throws URISyntaxException, UnsupportedFileSystemException { - return null; + protected Foo getTargetFileSystem(final URI uri) + throws URISyntaxException, UnsupportedFileSystemException { + return null; } @Override - protected - Foo getTargetFileSystem( - org.apache.hadoop.fs.viewfs.InodeTree.INodeDir<Foo> - dir) - throws URISyntaxException { + protected Foo getTargetFileSystem( + org.apache.hadoop.fs.viewfs.InodeTree.INodeDir<Foo> dir) + throws URISyntaxException { return null; } @Override - protected - Foo getTargetFileSystem(URI[] mergeFsURIList) + protected Foo getTargetFileSystem(URI[] mergeFsURIList) throws URISyntaxException, UnsupportedFileSystemException { return null; } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
