svn commit: r1647732 - in /hive/branches/spark: ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/ shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/ shims/0.23/src/main/java/org/apache/hadoop/hive/shims/ shims/common/src/main/java/org/apache...

[xu...@apache.org]

Author: xuefu
Date: Wed Dec 24 05:15:48 2014
New Revision: 1647732

URL: http://svn.apache.org/r1647732
Log:
HIVE-9209: Spark branch compile failed on hadoop-1[Spark Branch] (Chengxiang via Xuefu)

Modified:
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinTableContainerSerDe.java
    hive/branches/spark/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
    hive/branches/spark/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
    hive/branches/spark/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java

Modified: hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinTableContainerSerDe.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinTableContainerSerDe.java?rev=1647732&r1=1647731&r2=1647732&view=diff
==============================================================================
--- hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinTableContainerSerDe.java (original)
+++ hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinTableContainerSerDe.java Wed Dec 24 05:15:48 2014
@@ -32,6 +32,7 @@ import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hive.ql.metadata.HiveException;
 import org.apache.hadoop.hive.serde2.SerDe;
 import org.apache.hadoop.hive.serde2.SerDeException;
+import org.apache.hadoop.hive.shims.ShimLoader;
 import org.apache.hadoop.io.Writable;
 
 @SuppressWarnings("deprecation")
@@ -118,7 +119,7 @@ public class MapJoinTableContainerSerDe
 
       for (FileStatus fileStatus: fileStatuses) {
         Path filePath = fileStatus.getPath();
-        if (fileStatus.isDirectory()) {
+        if (ShimLoader.getHadoopShims().isDirectory(fileStatus)) {
           throw new HiveException("Error, not a file: " + filePath);
         }
         InputStream is = null;

Modified: hive/branches/spark/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java?rev=1647732&r1=1647731&r2=1647732&view=diff
==============================================================================
--- hive/branches/spark/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java (original)
+++ hive/branches/spark/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java Wed Dec 24 05:15:48 2014
@@ -562,6 +562,11 @@ public class Hadoop20SShims extends Hado
     return null;
   }
 
+  @Override
+  public boolean isDirectory(FileStatus fileStatus) {
+    return fileStatus.isDir();
+  }
+
   /**
    * Returns a shim to wrap KerberosName
    */

Modified: hive/branches/spark/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java?rev=1647732&r1=1647731&r2=1647732&view=diff
==============================================================================
--- hive/branches/spark/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java (original)
+++ hive/branches/spark/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java Wed Dec 24 05:15:48 2014
@@ -895,6 +895,11 @@ public class Hadoop23Shims extends Hadoo
     return new KerberosNameShim(name);
   }
 
+  @Override
+  public boolean isDirectory(FileStatus fileStatus) {
+    return fileStatus.isDirectory();
+  }
+
   /**
    * Shim for KerberosName
    */

Modified: hive/branches/spark/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java?rev=1647732&r1=1647731&r2=1647732&view=diff
==============================================================================
--- hive/branches/spark/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java (original)
+++ hive/branches/spark/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java Wed Dec 24 05:15:48 2014
@@ -523,6 +523,11 @@ public interface HadoopShims {
   public KerberosNameShim getKerberosNameShim(String name) throws IOException;
 
   /**
+   * Check whether file is directory.
+   */
+  boolean isDirectory(FileStatus fileStatus);
+
+  /**
    * Shim for KerberosName
    */
   public interface KerberosNameShim {