svn commit: r1215279 - in /hive/trunk: bin/hive shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java

[cw...@apache.org]

Author: cws
Date: Fri Dec 16 21:16:52 2011
New Revision: 1215279

URL: http://svn.apache.org/viewvc?rev=1215279&view=rev
Log:
HIVE-2631. Make Hive work with Hadoop 1.0.0 (Ashutosh Chauhan via cws)

Modified:
    hive/trunk/bin/hive
    hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java

Modified: hive/trunk/bin/hive
URL: http://svn.apache.org/viewvc/hive/trunk/bin/hive?rev=1215279&r1=1215278&r2=1215279&view=diff
==============================================================================
--- hive/trunk/bin/hive (original)
+++ hive/trunk/bin/hive Fri Dec 16 21:16:52 2011
@@ -143,6 +143,9 @@ else
     CLASSPATH=${CLASSPATH}:${AUX_CLASSPATH}
 fi
 
+# supress the HADOOP_HOME warnings in 1.x.x
+export HADOOP_HOME_WARN_SUPPRESS=true 
+
 # pass classpath to hadoop
 export HADOOP_CLASSPATH="${HADOOP_CLASSPATH}:${CLASSPATH}"
 
@@ -184,7 +187,7 @@ else
     exit 5
 fi
 
-if [ "$hadoop_minor_ver$hadoop_patch_ver" -lt "201" ]; then
+if [ "$hadoop_major_ver" -lt "1" -a  "$hadoop_minor_ver$hadoop_patch_ver" -lt "201" ]; then
     echo "Hive requires Hadoop 0.20.x (x >= 1)."
     echo "'hadoop version' returned:"
     echo `$HADOOP version`

Modified: hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java
URL: http://svn.apache.org/viewvc/hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java?rev=1215279&r1=1215278&r2=1215279&view=diff
==============================================================================
--- hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java (original)
+++ hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java Fri Dec 16 21:16:52 2011
@@ -117,6 +117,9 @@ public abstract class ShimLoader {
       throw new RuntimeException("Illegal Hadoop Version: " + vers +
           " (expected A.B.* format)");
     }
+    if (Integer.parseInt(parts[0]) > 0){
+      return "0.20S";
+    }
     String majorVersion = parts[0] + "." + parts[1];
 
     // If we are running a security release, we won't have UnixUserGroupInformation