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 iv...@apache.org on 2013/08/30 03:18:34 UTC
svn commit: r1518871 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: ./
src/main/java/org/apache/hadoop/fs/ src/test/java/org/apache/hadoop/fs/
Author: ivanmi
Date: Fri Aug 30 01:18:33 2013
New Revision: 1518871
URL: http://svn.apache.org/r1518871
Log:
HADOOP-9774. Merging change r1518865 from trunk
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Path.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestPath.java
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1518871&r1=1518870&r2=1518871&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Fri Aug 30 01:18:33 2013
@@ -168,6 +168,9 @@ Release 2.1.1-beta - UNRELEASED
HADOOP-9894. Race condition in Shell leads to logged error stream handling
exceptions (Arpit Agarwal)
+ HADOOP-9774. RawLocalFileSystem.listStatus() return absolute paths when
+ input path is relative on Windows. (Shanyu Zhao via ivanmi)
+
Release 2.1.0-beta - 2013-08-22
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Path.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Path.java?rev=1518871&r1=1518870&r2=1518871&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Path.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Path.java Fri Aug 30 01:18:33 2013
@@ -182,6 +182,18 @@ public class Path implements Comparable
/** Construct a Path from components. */
public Path(String scheme, String authority, String path) {
checkPathArg( path );
+
+ // add a slash in front of paths with Windows drive letters
+ if (hasWindowsDrive(path) && path.charAt(0) != '/') {
+ path = "/" + path;
+ }
+
+ // add "./" in front of Linux relative paths so that a path containing
+ // a colon e.q. "a:b" will not be interpreted as scheme "a".
+ if (!WINDOWS && path.charAt(0) != '/') {
+ path = "./" + path;
+ }
+
initialize(scheme, authority, path, null);
}
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java?rev=1518871&r1=1518870&r2=1518871&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java Fri Aug 30 01:18:33 2013
@@ -387,7 +387,7 @@ public class RawLocalFileSystem extends
new DeprecatedRawLocalFileStatus(localf, getDefaultBlockSize(f), this)};
}
- File[] names = localf.listFiles();
+ String[] names = localf.list();
if (names == null) {
return null;
}
@@ -395,7 +395,9 @@ public class RawLocalFileSystem extends
int j = 0;
for (int i = 0; i < names.length; i++) {
try {
- results[j] = getFileStatus(new Path(names[i].getAbsolutePath()));
+ // Assemble the path using the Path 3 arg constructor to make sure
+ // paths with colon are properly resolved on Linux
+ results[j] = getFileStatus(new Path(f, new Path(null, null, names[i])));
j++;
} catch (FileNotFoundException e) {
// ignore the files not found since the dir list may have have changed
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java?rev=1518871&r1=1518870&r2=1518871&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java Fri Aug 30 01:18:33 2013
@@ -275,6 +275,21 @@ public class TestLocalFileSystem {
stats[0].getPath().toUri().getPath());
}
+ @Test
+ public void testListStatusReturnConsistentPathOnWindows() throws IOException {
+ assumeTrue(Shell.WINDOWS);
+ String dirNoDriveSpec = TEST_ROOT_DIR;
+ if (dirNoDriveSpec.charAt(1) == ':')
+ dirNoDriveSpec = dirNoDriveSpec.substring(2);
+
+ File file = new File(dirNoDriveSpec, "foo");
+ file.mkdirs();
+ FileStatus[] stats = fileSys.listStatus(new Path(dirNoDriveSpec));
+ assertEquals("Unexpected number of stats", 1, stats.length);
+ assertEquals("Bad path from stat", new Path(file.getPath()).toUri().getPath(),
+ stats[0].getPath().toUri().getPath());
+ }
+
@Test(timeout = 10000)
public void testReportChecksumFailure() throws IOException {
base.mkdirs();
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestPath.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestPath.java?rev=1518871&r1=1518870&r2=1518871&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestPath.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestPath.java Fri Aug 30 01:18:33 2013
@@ -158,7 +158,43 @@ public class TestPath extends TestCase {
assertEquals(new Path("c:/foo"), new Path("d:/bar", "c:/foo"));
}
}
-
+
+ @Test (timeout = 30000)
+ public void testPathThreeArgContructor() {
+ assertEquals(new Path("foo"), new Path(null, null, "foo"));
+ assertEquals(new Path("scheme:///foo"), new Path("scheme", null, "/foo"));
+ assertEquals(
+ new Path("scheme://authority/foo"),
+ new Path("scheme", "authority", "/foo"));
+
+ if (Path.WINDOWS) {
+ assertEquals(new Path("c:/foo/bar"), new Path(null, null, "c:/foo/bar"));
+ assertEquals(new Path("c:/foo/bar"), new Path(null, null, "/c:/foo/bar"));
+ } else {
+ assertEquals(new Path("./a:b"), new Path(null, null, "a:b"));
+ }
+
+ // Resolution tests
+ if (Path.WINDOWS) {
+ assertEquals(
+ new Path("c:/foo/bar"),
+ new Path("/fou", new Path(null, null, "c:/foo/bar")));
+ assertEquals(
+ new Path("c:/foo/bar"),
+ new Path("/fou", new Path(null, null, "/c:/foo/bar")));
+ assertEquals(
+ new Path("/foo/bar"),
+ new Path("/foo", new Path(null, null, "bar")));
+ } else {
+ assertEquals(
+ new Path("/foo/bar/a:b"),
+ new Path("/foo/bar", new Path(null, null, "a:b")));
+ assertEquals(
+ new Path("/a:b"),
+ new Path("/foo/bar", new Path(null, null, "/a:b")));
+ }
+ }
+
@Test (timeout = 30000)
public void testEquals() {
assertFalse(new Path("/").equals(new Path("/foo")));