You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by je...@apache.org on 2013/08/23 17:56:26 UTC
svn commit: r1516908 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src:
main/java/org/apache/hadoop/fs/shell/PathData.java
test/java/org/apache/hadoop/cli/util/CommandExecutor.java
Author: jeagles
Date: Fri Aug 23 15:56:26 2013
New Revision: 1516908
URL: http://svn.apache.org/r1516908
Log:
HDFS-4329. DFSShell issues with directories with spaces in name (Cristina L. Abad via jeagles)
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/PathData.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/cli/util/CommandExecutor.java
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/PathData.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/PathData.java?rev=1516908&r1=1516907&r2=1516908&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/PathData.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/PathData.java Fri Aug 23 15:56:26 2013
@@ -106,10 +106,12 @@ public class PathData implements Compara
/**
* Validates the given Windows path.
- * Throws IOException on failure.
* @param pathString a String of the path suppliued by the user.
+ * @return true if the URI scheme was not present in the pathString but
+ * inferred; false, otherwise.
+ * @throws IOException if anything goes wrong
*/
- private void ValidateWindowsPath(String pathString)
+ private static boolean checkIfSchemeInferredFromPath(String pathString)
throws IOException
{
if (windowsNonUriAbsolutePath1.matcher(pathString).find()) {
@@ -118,23 +120,21 @@ public class PathData implements Compara
throw new IOException("Invalid path string " + pathString);
}
- inferredSchemeFromPath = true;
- return;
+ return true;
}
// Is it a forward slash-separated absolute path?
if (windowsNonUriAbsolutePath2.matcher(pathString).find()) {
- inferredSchemeFromPath = true;
- return;
+ return true;
}
// Does it look like a URI? If so then just leave it alone.
if (potentialUri.matcher(pathString).find()) {
- return;
+ return false;
}
// Looks like a relative path on Windows.
- return;
+ return false;
}
/**
@@ -153,7 +153,7 @@ public class PathData implements Compara
setStat(stat);
if (Path.WINDOWS) {
- ValidateWindowsPath(pathString);
+ inferredSchemeFromPath = checkIfSchemeInferredFromPath(pathString);
}
}
@@ -302,7 +302,7 @@ public class PathData implements Compara
// check getPath() so scheme slashes aren't considered part of the path
String separator = uri.getPath().endsWith(Path.SEPARATOR)
? "" : Path.SEPARATOR;
- return uri + separator + basename;
+ return uriToString(uri, inferredSchemeFromPath) + separator + basename;
}
protected enum PathType { HAS_SCHEME, SCHEMELESS_ABSOLUTE, RELATIVE };
@@ -356,7 +356,7 @@ public class PathData implements Compara
if (globUri.getAuthority() == null) {
matchUri = removeAuthority(matchUri);
}
- globMatch = matchUri.toString();
+ globMatch = uriToString(matchUri, false);
break;
case SCHEMELESS_ABSOLUTE: // take just the uri's path
globMatch = matchUri.getPath();
@@ -438,6 +438,10 @@ public class PathData implements Compara
*/
@Override
public String toString() {
+ return uriToString(uri, inferredSchemeFromPath);
+ }
+
+ private static String uriToString(URI uri, boolean inferredSchemeFromPath) {
String scheme = uri.getScheme();
// No interpretation of symbols. Just decode % escaped chars.
String decodedRemainder = uri.getSchemeSpecificPart();
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/cli/util/CommandExecutor.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/cli/util/CommandExecutor.java?rev=1516908&r1=1516907&r2=1516908&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/cli/util/CommandExecutor.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/cli/util/CommandExecutor.java Fri Aug 23 15:56:26 2013
@@ -24,6 +24,9 @@ import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.PrintStream;
import java.util.StringTokenizer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.ArrayList;
/**
*
@@ -32,23 +35,31 @@ import java.util.StringTokenizer;
public abstract class CommandExecutor {
protected String[] getCommandAsArgs(final String cmd, final String masterKey,
final String master) {
- StringTokenizer tokenizer = new StringTokenizer(cmd, " ");
- String[] args = new String[tokenizer.countTokens()];
-
- int i = 0;
- while (tokenizer.hasMoreTokens()) {
- args[i] = tokenizer.nextToken();
-
- args[i] = args[i].replaceAll(masterKey, master);
- args[i] = args[i].replaceAll("CLITEST_DATA",
- new File(CLITestHelper.TEST_CACHE_DATA_DIR).
- toURI().toString().replace(' ', '+'));
- args[i] = args[i].replaceAll("USERNAME", System.getProperty("user.name"));
+ String regex = "\'([^\']*)\'|\"([^\"]*)\"|(\\S+)";
+ Matcher matcher = Pattern.compile(regex).matcher(cmd);
- i++;
- }
-
- return args;
+ ArrayList<String> args = new ArrayList<String>();
+ String arg = null;
+
+ while (matcher.find()) {
+ if (matcher.group(1) != null) {
+ arg = matcher.group(1);
+ } else if (matcher.group(2) != null) {
+ arg = matcher.group(2);
+ } else {
+ arg = matcher.group(3);
+ }
+
+ arg = arg.replaceAll(masterKey, master);
+ arg = arg.replaceAll("CLITEST_DATA",
+ new File(CLITestHelper.TEST_CACHE_DATA_DIR).
+ toURI().toString().replace(' ', '+'));
+ arg = arg.replaceAll("USERNAME", System.getProperty("user.name"));
+
+ args.add(arg);
+ }
+
+ return args.toArray(new String[0]);
}
public Result executeCommand(final String cmd) throws Exception {