From 5cc64097aedbc12aea751aca297fa6e9a7c8039f Mon Sep 17 00:00:00 2001
From: Arvind Prabhakar <arvind@apache.org>
Date: Tue, 13 Dec 2011 22:34:32 +0000
Subject: [PATCH] SQOOP-405. Enable TestDataDrivenDBInputFormat for Hadoop 0.23

(Bilung Lee via Arvind Prabhakar)


git-svn-id: https://svn.apache.org/repos/asf/incubator/sqoop/trunk@1213964 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                                     | 25 ++++++++++++++++++-
 ivy.xml                                       | 12 ++++-----
 ivy/libraries.properties                      |  5 ----
 .../db/TestDataDrivenDBInputFormat.java       | 13 ----------
 4 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/build.xml b/build.xml
index f8a6e0d2..8331dea3 100644
--- a/build.xml
+++ b/build.xml
@@ -169,9 +169,32 @@
     </else>
   </if>
 
-  <!-- Ivy-based dependency resolution -->
+  <!-- Ivy library properties -->
   <property name="ivy.dir" location="${basedir}/ivy" />
   <loadproperties srcfile="${ivy.dir}/libraries.properties"/>
+  <if>
+    <equals arg1="${hadoopversion}" arg2="20" />
+    <then>
+      <property name="hadoop.version" value="0.20.2-cdh3u1" />
+      <property name="hbase.version" value="0.90.3-cdh3u1" />
+      <property name="zookeeper.version" value="3.3.3-cdh3u1" />
+    </then>
+
+    <elseif>
+      <equals arg1="${hadoopversion}" arg2="23" />
+      <then>
+        <property name="hadoop.version" value="0.23.1-SNAPSHOT" />
+        <property name="hbase.version" value="0.92.0-SNAPSHOT" />
+        <property name="zookeeper.version" value="3.4.0-SNAPSHOT" />
+      </then>
+    </elseif>
+
+    <else>
+      <fail message="Unrecognized hadoopversion. Can only be 20 or 23." />
+    </else>
+  </if>
+
+  <!-- Ivy-based dependency resolution -->
   <property name="ivysettings.xml" location="${ivy.dir}/ivysettings.xml"/>
   <property name="ivy.jar" location="${lib.dir}/ivy-${ivy.version}.jar"/>
   <property name="ivy_repo_url"
diff --git a/ivy.xml b/ivy.xml
index 0a40c225..729e2ab8 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -69,25 +69,25 @@ under the License.
 
     <!-- Dependencies for Hadoop 0.23 -->
     <dependency org="org.apache.hadoop" name="hadoop-common"
-      rev="${hadoop-common.version}" conf="hadoop23->default">
+      rev="${hadoop.version}" conf="hadoop23->default">
       <artifact name="hadoop-common" type="jar" />
       <artifact name="hadoop-common" type="jar" m:classifier="tests"/>
     </dependency>
     <dependency org="org.apache.hadoop" name="hadoop-hdfs"
-      rev="${hadoop-common.version}" conf="hadoop23->default">
+      rev="${hadoop.version}" conf="hadoop23->default">
       <artifact name="hadoop-hdfs" type="jar" />
       <artifact name="hadoop-hdfs" type="jar" m:classifier="tests"/>
     </dependency>
     <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-common"
-      rev="${hadoop-common.version}" conf="hadoop23->default"/>
+      rev="${hadoop.version}" conf="hadoop23->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
-      rev="${hadoop-common.version}" conf="hadoop23->default"/>
+      rev="${hadoop.version}" conf="hadoop23->default"/>
 
     <!-- Dependencies for Hadoop 0.20 -->
     <dependency org="org.apache.hadoop" name="hadoop-core"
-      rev="${hadoop-core.version}" conf="hadoop20->default"/>
+      rev="${hadoop.version}" conf="hadoop20->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-test"
-      rev="${hadoop-core.version}" conf="hadoop20test->default"/>
+      rev="${hadoop.version}" conf="hadoop20test->default"/>
 
     <!-- Common dependencies for Sqoop -->
     <dependency org="commons-cli" name="commons-cli"
diff --git a/ivy/libraries.properties b/ivy/libraries.properties
index 19e2ed70..4c9e37d3 100644
--- a/ivy/libraries.properties
+++ b/ivy/libraries.properties
@@ -28,11 +28,6 @@ commons-io.version=1.4
 commons-lang.version=2.4
 commons-logging.version=1.0.4
 
-hadoop-core.version=0.20.2-cdh3u1
-hadoop-common.version=0.23.0-SNAPSHOT
-hbase.version=0.90.3-cdh3u1
-zookeeper.version=3.3.3-cdh3u1
-
 hsqldb.version=1.8.0.10
 
 ivy.version=2.1.0
diff --git a/src/test/com/cloudera/sqoop/mapreduce/db/TestDataDrivenDBInputFormat.java b/src/test/com/cloudera/sqoop/mapreduce/db/TestDataDrivenDBInputFormat.java
index 7b3ddead..363ae913 100644
--- a/src/test/com/cloudera/sqoop/mapreduce/db/TestDataDrivenDBInputFormat.java
+++ b/src/test/com/cloudera/sqoop/mapreduce/db/TestDataDrivenDBInputFormat.java
@@ -35,7 +35,6 @@
 import org.apache.hadoop.mapreduce.lib.db.*;
 import org.apache.hadoop.mapreduce.lib.output.*;
 import org.apache.hadoop.util.StringUtils;
-import org.apache.hadoop.util.VersionInfo;
 
 /**
  * Test aspects of DataDrivenDBInputFormat.
@@ -83,17 +82,11 @@ private void initialize(String driverClassName, String url)
   }
 
   public void setUp() throws Exception {
-    if (!isHadoop20()) {
-      return;
-    }
     initialize(DRIVER_CLASS, DB_URL);
     super.setUp();
   }
 
   public void tearDown() throws Exception {
-    if (!isHadoop20()) {
-      return;
-    }
     super.tearDown();
     shutdown();
   }
@@ -172,9 +165,6 @@ public void map(Object k, Object v, Context c)
   }
 
   public void testDateSplits() throws Exception {
-    if (!isHadoop20()) {
-      return;
-    }
     Statement s = connection.createStatement();
     final String DATE_TABLE = "datetable";
     final String COL = "foo";
@@ -230,7 +220,4 @@ public void testDateSplits() throws Exception {
     }
   }
 
-  protected boolean isHadoop20() {
-    return VersionInfo.getVersion().startsWith("0.20");
-  }
 }