You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by nz...@apache.org on 2010/10/13 15:31:19 UTC

svn commit: r1022097 - in /hadoop/hive/trunk: CHANGES.txt shims/build.xml shims/ivy.xml shims/src/0.17/ shims/src/0.18/ shims/src/0.19/ shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java

Author: nzhang
Date: Wed Oct 13 13:31:18 2010
New Revision: 1022097

URL: http://svn.apache.org/viewvc?rev=1022097&view=rev
Log:
HIVE-1701. drop support for pre-0.20 Hadoop versions (jvs via Ning Zhang)

Removed:
    hadoop/hive/trunk/shims/src/0.17/
    hadoop/hive/trunk/shims/src/0.18/
    hadoop/hive/trunk/shims/src/0.19/
Modified:
    hadoop/hive/trunk/CHANGES.txt
    hadoop/hive/trunk/shims/build.xml
    hadoop/hive/trunk/shims/ivy.xml
    hadoop/hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java

Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=1022097&r1=1022096&r2=1022097&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Wed Oct 13 13:31:18 2010
@@ -184,6 +184,9 @@ Trunk -  Unreleased
     HIVE-1264. Make Hive work with Hadoop security
     (Todd Lipcon via jvs)
 
+    HIVE-1701. drop support for pre-0.20 Hadoop versions
+    (jvs via Ning Zhang)
+
   OPTIMIZATIONS
 
   BUG FIXES

Modified: hadoop/hive/trunk/shims/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/shims/build.xml?rev=1022097&r1=1022096&r2=1022097&view=diff
==============================================================================
--- hadoop/hive/trunk/shims/build.xml (original)
+++ hadoop/hive/trunk/shims/build.xml Wed Oct 13 13:31:18 2010
@@ -58,15 +58,6 @@ to call at top-level: ant deploy-contrib
 
   <target name="compile" depends="init">
     <antcall target="build_shims" inheritRefs="false" inheritAll="false">
-      <param name="hadoop.version.ant-internal" value="0.17.2.1" />
-    </antcall>
-    <antcall target="build_shims" inheritRefs="false" inheritAll="false">
-      <param name="hadoop.version.ant-internal" value="0.18.3" />
-    </antcall>
-    <antcall target="build_shims" inheritRefs="false" inheritAll="false">
-      <param name="hadoop.version.ant-internal" value="0.19.0" />
-    </antcall>
-    <antcall target="build_shims" inheritRefs="false" inheritAll="false">
       <param name="hadoop.version.ant-internal" value="0.20.0" />
     </antcall>
     <antcall target="build_shims" inheritRefs="false" inheritAll="false">

Modified: hadoop/hive/trunk/shims/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/shims/ivy.xml?rev=1022097&r1=1022096&r2=1022097&view=diff
==============================================================================
--- hadoop/hive/trunk/shims/ivy.xml (original)
+++ hadoop/hive/trunk/shims/ivy.xml Wed Oct 13 13:31:18 2010
@@ -1,15 +1,6 @@
 <ivy-module version="2.0">
     <info organisation="org.apache.hadoop.hive" module="shims"/>
     <dependencies>
-        <dependency org="hadoop" name="core" rev="0.17.2.1">
-          <artifact name="hadoop" type="source" ext="tar.gz"/>
-        </dependency> 
-        <dependency org="hadoop" name="core" rev="0.18.3">
-          <artifact name="hadoop" type="source" ext="tar.gz"/>
-        </dependency> 
-        <dependency org="hadoop" name="core" rev="0.19.0">
-          <artifact name="hadoop" type="source" ext="tar.gz"/>
-        </dependency> 
         <dependency org="hadoop" name="core" rev="0.20.0">
           <artifact name="hadoop" type="source" ext="tar.gz"/>
         </dependency> 

Modified: hadoop/hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java?rev=1022097&r1=1022096&r2=1022097&view=diff
==============================================================================
--- hadoop/hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java (original)
+++ hadoop/hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java Wed Oct 13 13:31:18 2010
@@ -37,9 +37,6 @@ public abstract class ShimLoader {
       new HashMap<String, String>();
 
   static {
-    HADOOP_SHIM_CLASSES.put("0.17", "org.apache.hadoop.hive.shims.Hadoop17Shims");
-    HADOOP_SHIM_CLASSES.put("0.18", "org.apache.hadoop.hive.shims.Hadoop18Shims");
-    HADOOP_SHIM_CLASSES.put("0.19", "org.apache.hadoop.hive.shims.Hadoop19Shims");
     HADOOP_SHIM_CLASSES.put("0.20", "org.apache.hadoop.hive.shims.Hadoop20Shims");
     HADOOP_SHIM_CLASSES.put("0.20S", "org.apache.hadoop.hive.shims.Hadoop20SShims");
   }
@@ -52,9 +49,6 @@ public abstract class ShimLoader {
       new HashMap<String, String>();
 
   static {
-    JETTY_SHIM_CLASSES.put("0.17", "org.apache.hadoop.hive.shims.Jetty17Shims");
-    JETTY_SHIM_CLASSES.put("0.18", "org.apache.hadoop.hive.shims.Jetty18Shims");
-    JETTY_SHIM_CLASSES.put("0.19", "org.apache.hadoop.hive.shims.Jetty19Shims");
     JETTY_SHIM_CLASSES.put("0.20", "org.apache.hadoop.hive.shims.Jetty20Shims");
     JETTY_SHIM_CLASSES.put("0.20S", "org.apache.hadoop.hive.shims.Jetty20SShims");
   }