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

Revert previous commit r1301273 for HADOOP-8175. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1301282 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2012-03-15 23:53:37 +00:00
parent 889a863da1
commit c7feccd7ed
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -305,10 +305,7 @@ Release 0.23.2 - UNRELEASED
HADOOP-8137. Added links to CLI manuals to the site. (tgraves via HADOOP-8137. Added links to CLI manuals to the site. (tgraves via
acmurthy) acmurthy)
HADOOP-8175. FsShell: Add -p option to mkdir. (Daryn Sharp via szetszwo)
OPTIMIZATIONS OPTIMIZATIONS
HADOOP-8071. Avoid an extra packet in client code when nagling is HADOOP-8071. Avoid an extra packet in client code when nagling is
disabled. (todd) disabled. (todd)

8
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Mkdir.java
View File

@ -43,21 +43,16 @@ class Mkdir extends FsCommand {
public static final String DESCRIPTION = public static final String DESCRIPTION =
"Create a directory in specified location."; "Create a directory in specified location.";
private boolean createParents;
@Override @Override
protected void processOptions(LinkedList<String> args) { protected void processOptions(LinkedList<String> args) {
CommandFormat cf = new CommandFormat(1, Integer.MAX_VALUE, "p"); CommandFormat cf = new CommandFormat(1, Integer.MAX_VALUE);
cf.parse(args); cf.parse(args);
createParents = cf.getOpt("p");
} }
@Override @Override
protected void processPath(PathData item) throws IOException { protected void processPath(PathData item) throws IOException {
if (item.stat.isDirectory()) { if (item.stat.isDirectory()) {
if (!createParents) {
throw new PathExistsException(item.toString()); throw new PathExistsException(item.toString());
}
} else { } else {
throw new PathIsNotDirectoryException(item.toString()); throw new PathIsNotDirectoryException(item.toString());
} }
@ -65,7 +60,6 @@ class Mkdir extends FsCommand {
@Override @Override
protected void processNonexistentPath(PathData item) throws IOException { protected void processNonexistentPath(PathData item) throws IOException {
// TODO: should use createParents to control intermediate dir creation
if (!item.fs.mkdirs(item.path)) { if (!item.fs.mkdirs(item.path)) {
throw new PathIOException(item.toString()); throw new PathIOException(item.toString());
} }