svn commit: r1521595 - in /hive/branches/branch-0.12: ./ ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java

[brock]

Author: brock
Date: Tue Sep 10 19:22:48 2013
New Revision: 1521595

URL: http://svn.apache.org/r1521595
Log:
HIVE-4619 - Hive 0.11.0 is not working with pre-cdh3u6 and hadoop-0.23 (Navis 
via Brock Noland)

Modified:
    hive/branches/branch-0.12/   (props changed)
    
hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java

Propchange: hive/branches/branch-0.12/
------------------------------------------------------------------------------
  Merged /hive/trunk:r1521593

Modified: 
hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java
URL: 
http://svn.apache.org/viewvc/hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java?rev=1521595&r1=1521594&r2=1521595&view=diff
==============================================================================
--- 
hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java
 (original)
+++ 
hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java
 Tue Sep 10 19:22:48 2013
@@ -347,6 +347,8 @@ public class MapOperator extends Operato
     Path fpath = new Path(HiveConf.getVar(hconf,
         HiveConf.ConfVars.HADOOPMAPFILENAME));
 
+    boolean schemeless = fpath.toUri().getScheme() == null;
+
     List<Operator<? extends OperatorDesc>> children =
         new ArrayList<Operator<? extends OperatorDesc>>();
 
@@ -358,6 +360,10 @@ public class MapOperator extends Operato
         List<String> aliases = entry.getValue();
 
         Path onepath = new Path(onefile);
+        if (schemeless) {
+          onepath = new Path(onepath.toUri().getPath());
+        }
+
         PartitionDesc partDesc = conf.getPathToPartitionInfo().get(onefile);
 
         for (String onealias : aliases) {