From 98df316058c2c3dd9d3c6dc6143371de86c610f4 Mon Sep 17 00:00:00 2001 From: Thomas Graves Date: Thu, 5 Apr 2012 20:11:52 +0000 Subject: [PATCH] MAPREDUCE-3621. TestDBJob and TestDataDrivenDBInputFormat ant tests fail (Ravi Prakash via tgraves) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1310043 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 4 ++++ .../hadoop-mapreduce-client-jobclient/pom.xml | 6 ++++++ .../mapreduce/lib/db/TestDataDrivenDBInputFormat.java | 10 +++++----- .../hadoop-mapreduce-client/pom.xml | 4 ---- .../hadoop-mapreduce-examples/pom.xml | 5 +++++ .../org/apache/hadoop/examples/DBCountPageView.java | 4 ++-- .../org/apache/hadoop/mapreduce/lib/db/TestDBJob.java | 4 ++-- hadoop-mapreduce-project/hadoop-yarn/pom.xml | 4 ---- hadoop-mapreduce-project/pom.xml | 4 ---- 9 files changed, 24 insertions(+), 21 deletions(-) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/db/TestDataDrivenDBInputFormat.java (96%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-examples/src/test/java}/org/apache/hadoop/mapreduce/lib/db/TestDBJob.java (99%) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 54891b89dc..e65d1903ad 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -257,6 +257,10 @@ Release 0.23.3 - UNRELEASED directory (John George via bobby) MAPREDUCE-3650. testGetTokensForHftpFS() fails (Ravi Prakash via bobby) + + MAPREDUCE-3621. TestDBJob and TestDataDrivenDBInputFormat ant tests fail + (Ravi Prakash via tgraves) + Release 0.23.2 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml index 4df2edaa5c..e3853e9d43 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml @@ -88,6 +88,12 @@ test test-jar + + org.hsqldb + hsqldb + 2.0.0 + test + diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/db/TestDataDrivenDBInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestDataDrivenDBInputFormat.java similarity index 96% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/db/TestDataDrivenDBInputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestDataDrivenDBInputFormat.java index adc27b3469..37f93645c1 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/db/TestDataDrivenDBInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestDataDrivenDBInputFormat.java @@ -25,7 +25,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.examples.DBCountPageView; +//import org.apache.hadoop.examples.DBCountPageView; import org.apache.hadoop.fs.*; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.NullWritable; @@ -36,7 +36,7 @@ import org.apache.hadoop.mapreduce.lib.input.*; import org.apache.hadoop.mapreduce.lib.output.*; import org.apache.hadoop.util.StringUtils; -import org.hsqldb.Server; +import org.hsqldb.server.Server; /** * Test aspects of DataDrivenDBInputFormat @@ -47,9 +47,9 @@ public class TestDataDrivenDBInputFormat extends HadoopTestCase { TestDataDrivenDBInputFormat.class); private static final String DB_NAME = "dddbif"; - private static final String DB_URL = + private static final String DB_URL = "jdbc:hsqldb:hsql://localhost/" + DB_NAME; - private static final String DRIVER_CLASS = "org.hsqldb.jdbcDriver"; + private static final String DRIVER_CLASS = "org.hsqldb.jdbc.JDBCDriver"; private Server server; private Connection connection; @@ -181,7 +181,7 @@ public void testDateSplits() throws Exception { } // Create the table. - s.executeUpdate("CREATE TABLE " + DATE_TABLE + "(" + COL + " TIMESTAMP)"); + s.executeUpdate("CREATE TABLE " + DATE_TABLE + "(" + COL + " DATE)"); s.executeUpdate("INSERT INTO " + DATE_TABLE + " VALUES('2010-04-01')"); s.executeUpdate("INSERT INTO " + DATE_TABLE + " VALUES('2010-04-02')"); s.executeUpdate("INSERT INTO " + DATE_TABLE + " VALUES('2010-05-01')"); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml index ad08306ba7..87cea92eff 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml @@ -86,10 +86,6 @@ org.mortbay.jetty jsp-2.1-jetty - - hsqldb - hsqldb - diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml index 83424a80de..3520839173 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml @@ -92,6 +92,11 @@ hadoop-mapreduce-client-hs test + + org.hsqldb + hsqldb + 2.0.0 + diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/DBCountPageView.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/DBCountPageView.java index cbb1b075f6..1b4dc90236 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/DBCountPageView.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/DBCountPageView.java @@ -49,7 +49,7 @@ import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; -import org.hsqldb.Server; +import org.hsqldb.server.Server; /** * This is a demonstrative program, which uses DBInputFormat for reading @@ -78,7 +78,7 @@ public class DBCountPageView extends Configured implements Tool { private static final String DB_URL = "jdbc:hsqldb:hsql://localhost/URLAccess"; - private static final String DRIVER_CLASS = "org.hsqldb.jdbcDriver"; + private static final String DRIVER_CLASS = "org.hsqldb.jdbc.JDBCDriver"; private Server server; diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/db/TestDBJob.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestDBJob.java similarity index 99% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/db/TestDBJob.java rename to hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestDBJob.java index d0f5d862df..ce3f4d86ce 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/db/TestDBJob.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestDBJob.java @@ -30,10 +30,10 @@ public class TestDBJob extends HadoopTestCase { public TestDBJob() throws IOException { super(LOCAL_MR, LOCAL_FS, 3, 1); } - + public void testRun() throws Exception { DBCountPageView testDriver = new DBCountPageView(); ToolRunner.run(createJobConf(), testDriver, new String[0]); } - + } diff --git a/hadoop-mapreduce-project/hadoop-yarn/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/pom.xml index 0f76b24480..fc0f8f895a 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/pom.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/pom.xml @@ -55,10 +55,6 @@ org.mortbay.jetty jsp-2.1-jetty - - hsqldb - hsqldb - diff --git a/hadoop-mapreduce-project/pom.xml b/hadoop-mapreduce-project/pom.xml index 859eb26a6d..a536ce3ee8 100644 --- a/hadoop-mapreduce-project/pom.xml +++ b/hadoop-mapreduce-project/pom.xml @@ -100,10 +100,6 @@ org.mortbay.jetty jsp-2.1-jetty - - hsqldb - hsqldb -