tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ss...@apache.org
Subject git commit: TEZ-1713. tez.lib.uris should not require the paths specified to be fully qualified. (sseth) (cherry picked from commit 65b5b8c9c901198b1661110eb91591201a6c7f12)
Date Tue, 28 Oct 2014 22:15:52 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.5 d3d275a15 -> 393252eed


TEZ-1713. tez.lib.uris should not require the paths specified to be
fully qualified. (sseth)
(cherry picked from commit 65b5b8c9c901198b1661110eb91591201a6c7f12)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/393252ee
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/393252ee
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/393252ee

Branch: refs/heads/branch-0.5
Commit: 393252eedcc69f0f86f0717369c8d9f11fe1b018
Parents: d3d275a
Author: Siddharth Seth <sseth@apache.org>
Authored: Tue Oct 28 15:15:20 2014 -0700
Committer: Siddharth Seth <sseth@apache.org>
Committed: Tue Oct 28 15:15:44 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                                        |  1 +
 .../java/org/apache/tez/client/TezClientUtils.java | 17 ++++++-----------
 2 files changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/393252ee/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1f1bf00..2669aa1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -61,6 +61,7 @@ ALL CHANGES:
   TEZ-1596. Secure Shuffle utils is extremely expensive for fast queries.
   TEZ-1712. SSL context gets destroyed too soon after downloading data from one of the vertices.
   TEZ-1710. Add support for cluster default AM/task launch opts.
+  TEZ-1713. tez.lib.uris should not require the paths specified to be fully qualified.
 
 Release 0.5.1: 2014-10-02
 

http://git-wip-us.apache.org/repos/asf/tez/blob/393252ee/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java b/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
index a917853..f236bf1 100644
--- a/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
+++ b/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
@@ -120,19 +120,14 @@ public class TezClientUtils {
       throw new TezUncheckedException(message, e);
     }
 
-    if (!uri.isAbsolute()) {
-      String message = "Non-absolute URI defined in configuration for"
-          + " location of TEZ jars. providedURI=" + fileName;
-      LOG.error(message);
-      throw new TezUncheckedException(message);
-    }
     Path p = new Path(uri);
-    FileSystem pathfs = p.getFileSystem(conf);
-    p = pathfs.makeQualified(p);
-    if (pathfs.isDirectory(p)) {
-      return pathfs.listStatus(p);
+    FileSystem fs = p.getFileSystem(conf);
+    p = fs.resolvePath(p);
+
+    if (fs.isDirectory(p)) {
+      return fs.listStatus(p);
     } else {
-      FileStatus fStatus = pathfs.getFileStatus(p);
+      FileStatus fStatus = fs.getFileStatus(p);
       return new FileStatus[]{fStatus};
     }
   }


Mime
View raw message