github/sqoop
5
0
Fork 0
mirror of https://github.com/apache/sqoop.git synced 2025-05-17 01:11:07 +08:00
Code Issues Projects Releases Wiki Activity

Enable findbugs on build and fix all warnings.

Browse Source 
Some spurious warnings (and inconsequential warnings in test code)
have been disabled by src/test/findbugsExcludeFile.xml.

From: Aaron Kimball <aaron@cloudera.com>

git-svn-id: https://svn.apache.org/repos/asf/incubator/sqoop/trunk@1149874 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andrew Bayer 2011-07-22 20:03:39 +00:00
parent 7214230695
commit 8147d262d8
24 changed files with 375 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
build.xml
View File

@ -38,6 +38,7 @@
<property name="build.dir" location="${basedir}/build" />
<property name="build.classes" location="${build.dir}/classes"/>
<property name="build.test" location="${build.dir}/test"/>
<property name="build.test.classes" location="${build.test}/classes" />
<property name="test.log.dir" location="${build.dir}/test/logs"/>
<property name="dist.dir" location="${build.dir}/${artifact.name}" />
<property name="tar.file" location="${build.dir}/${artifact.name}.tar.gz" />
@ -52,6 +53,15 @@
<property name="test.output" value="no"/>
<property name="test.timeout" value="300000"/>
<!-- static analysis -->
<property name="findbugs.out.dir" value="${build.dir}/findbugs" />
<property name="findbugs.output.xml.file"
value="${findbugs.out.dir}/report.xml" />
<property name="findbugs.output.html.file"
value="${findbugs.out.dir}/report.html" />
<property name="findbugs.excludes"
location="${test.dir}/findbugsExcludeFile.xml" />
<!-- When testing with non-free JDBC drivers, override this parameter
to contain the path to the driver library dir.
-->
@ -93,7 +103,7 @@
<!-- Classpath for unit tests (superset of compile.classpath) -->
<path id="test.classpath">
<pathelement location="${build.test}" />
<pathelement location="${build.test.classes}" />
<path refid="${name}.test.classpath"/>
<path refid="compile.classpath"/>
</path>
@ -118,12 +128,12 @@
<target name="compile-test" depends="compile, ivy-retrieve-test"
description="Compile test classes">
<mkdir dir="${build.test}" />
<mkdir dir="${build.test.classes}" />
<javac
encoding="${build.encoding}"
srcdir="${test.dir}"
includes="**/*.java"
destdir="${build.test}"
destdir="${build.test.classes}"
debug="${javac.debug}">
<classpath>
<path refid="test.classpath"/>
@ -228,6 +238,9 @@
timeout="${test.timeout}"
dir="${build.test}/data">
<!-- enable asserts in tests -->
<jvmarg value="-ea" />
<!-- uncomment this if you want to attach a debugger -->
<!--
<jvmarg line="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=2601" />
@ -310,6 +323,36 @@
<delete dir="${build.dir}"/>
</target>
<target name="findbugs" depends="check-for-findbugs,jar,compile-test"
if="findbugs.present" description="Run FindBugs">
<taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"
classpath="${findbugs.home}/lib/findbugs-ant.jar" />
<mkdir dir="${findbugs.out.dir}"/>
<findbugs home="${findbugs.home}" output="xml:withMessages"
outputFile="${findbugs.output.xml.file}" effort="max"
excludeFilter="${findbugs.excludes}">
<auxClasspath>
<path refid="compile.classpath"/>
</auxClasspath>
<sourcePath path="${src.dir}" />
<sourcePath path="${test.dir}" />
<class location="${build.dir}/${dest.jar}" />
<class location="${build.test.classes}" />
</findbugs>
<xslt style="${findbugs.home}/src/xsl/default.xsl"
in="${findbugs.output.xml.file}"
out="${findbugs.output.html.file}" />
</target>
<target name="warn-findbugs-unset" unless="findbugs.home">
<fail message="You need to set -Dfindbugs.home=/path/to/findbugs" />
</target>
<target name="check-for-findbugs" depends="warn-findbugs-unset">
<available property="findbugs.present"
file="${findbugs.home}/lib/findbugs.jar" />
</target>
<target name="ivy-probe-antlib" >
<condition property="ivy.found">
<typefound uri="antlib:org.apache.ivy.ant" name="cleancache"/>

2
src/java/org/apache/hadoop/sqoop/manager/DirectMySQLManager.java
View File

@ -61,7 +61,7 @@ public void importTable(ImportJobContext context)
LOG.warn("Direct-mode import from MySQL does not support column");
LOG.warn("selection. Falling back to JDBC-based import.");
// Don't warn them "This could go faster..."
MySQLManager.warningPrinted = true;
MySQLManager.markWarningPrinted();
// Use JDBC-based importTable() method.
super.importTable(context);
return;

1
src/java/org/apache/hadoop/sqoop/manager/DirectPostgresqlManager.java
View File

@ -281,7 +281,6 @@ public void importTable(ImportJobContext context)
throws IOException, ImportException {
String tableName = context.getTableName();
String jarFile = context.getJarFile();
SqoopOptions options = context.getOptions();
LOG.info("Beginning psql fast path import");

13
src/java/org/apache/hadoop/sqoop/manager/MySQLManager.java
View File

@ -45,7 +45,7 @@ public class MySQLManager extends GenericJdbcManager {
private static final String DRIVER_CLASS = "com.mysql.jdbc.Driver";
// set to true after we warn the user that we can use direct fastpath.
protected static boolean warningPrinted = false;
private static boolean warningPrinted = false;
private Statement lastStatement;
@ -114,7 +114,7 @@ public void importTable(ImportJobContext context)
LOG.warn("This transfer can be faster! Use the --direct");
LOG.warn("option to exercise a MySQL-specific fast path.");
MySQLManager.warningPrinted = true; // don't display this twice.
MySQLManager.markWarningPrinted(); // don't display this twice.
}
}
@ -124,6 +124,13 @@ public void importTable(ImportJobContext context)
super.importTable(context);
}
/**
* Set a flag to prevent printing the --direct warning twice.
*/
protected static void markWarningPrinted() {
MySQLManager.warningPrinted = true;
}
/**
* MySQL allows TIMESTAMP fields to have the value '0000-00-00 00:00:00',
* which causes errors in import. If the user has not set the
@ -191,6 +198,7 @@ protected ResultSet execute(String stmt, Object... args) throws SQLException {
PreparedStatement statement = null;
statement = this.getConnection().prepareStatement(stmt,
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
this.lastStatement = statement;
statement.setFetchSize(Integer.MIN_VALUE); // MySQL: read row-at-a-time.
if (null != args) {
for (int i = 0; i < args.length; i++) {
@ -199,7 +207,6 @@ protected ResultSet execute(String stmt, Object... args) throws SQLException {
}
LOG.info("Executing SQL statement: " + stmt);
this.lastStatement = statement;
return statement.executeQuery();
}

4
src/java/org/apache/hadoop/sqoop/manager/PostgresqlManager.java
View File

@ -80,8 +80,6 @@ public void importTable(ImportJobContext context)
// The user probably should have requested --direct to invoke pg_dump.
// Display a warning informing them of this fact.
if (!PostgresqlManager.warningPrinted) {
String connectString = context.getOptions().getConnectString();
LOG.warn("It looks like you are importing from postgresql.");
LOG.warn("This transfer can be faster! Use the --direct");
LOG.warn("option to exercise a postgresql-specific fast path.");
@ -117,6 +115,7 @@ protected ResultSet execute(String stmt, Object... args) throws SQLException {
PreparedStatement statement = null;
statement = this.getConnection().prepareStatement(stmt,
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
this.lastStatement = statement;
statement.setFetchSize(POSTGRESQL_FETCH_SIZE);
if (null != args) {
for (int i = 0; i < args.length; i++) {
@ -125,7 +124,6 @@ protected ResultSet execute(String stmt, Object... args) throws SQLException {
}
LOG.info("Executing SQL statement: " + stmt);
this.lastStatement = statement;
return statement.executeQuery();
}

2
src/java/org/apache/hadoop/sqoop/manager/SqlManager.java
View File

@ -326,6 +326,7 @@ protected ResultSet execute(String stmt, Object... args) throws SQLException {
PreparedStatement statement = null;
statement = this.getConnection().prepareStatement(stmt,
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
this.lastStatement = statement;
if (null != args) {
for (int i = 0; i < args.length; i++) {
statement.setObject(i + 1, args[i]);
@ -333,7 +334,6 @@ protected ResultSet execute(String stmt, Object... args) throws SQLException {
}
LOG.info("Executing SQL statement: " + stmt);
this.lastStatement = statement;
return statement.executeQuery();
}

3
src/java/org/apache/hadoop/sqoop/mapreduce/MySQLDumpInputFormat.java
View File

@ -72,8 +72,6 @@ public class MySQLDumpInputFormat extends DataDrivenDBInputFormat {
public static class MySQLDumpRecordReader
extends RecordReader<String, NullWritable> {
private InputSplit split;
private boolean delivered;
private String clause;
@ -109,7 +107,6 @@ public float getProgress() {
@Override
public void initialize(InputSplit split, TaskAttemptContext context) {
this.split = split;
DataDrivenDBInputFormat.DataDrivenDBInputSplit dbSplit =
(DataDrivenDBInputFormat.DataDrivenDBInputSplit) split;

4
src/java/org/apache/hadoop/sqoop/mapreduce/MySQLDumpMapper.java
View File

@ -271,7 +271,9 @@ public void run() {
try {
fields = MYSQLDUMP_PARSER.parseRecord(charbuf);
} catch (RecordParser.ParseError pe) {
LOG.warn("ParseError reading from mysqldump: " + pe.toString() + "; record skipped");
LOG.warn("ParseError reading from mysqldump: "
+ pe.toString() + "; record skipped");
continue; // Skip emitting this row.
}
// For all of the output fields, emit them using the delimiters the user chooses.

2
src/java/org/apache/hadoop/sqoop/util/NullAsyncSink.java
View File

@ -49,7 +49,7 @@ public int join() throws InterruptedException {
* Run a background thread that reads and ignores the
* contents of the stream.
*/
private class IgnoringThread extends Thread {
private static class IgnoringThread extends Thread {
private InputStream stream;

67
src/test/findbugsExcludeFile.xml Normal file
View File

@ -0,0 +1,67 @@
<?xml version="1.0"?>
<!--
Licensed to Cloudera, Inc. under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
Cloudera, Inc. licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!--
This file enumerates all the findbugs warnings that we want to suppress.
If you add a spurious warning, you should add it to this file so that it
does not generate warnings in the official report.
For each exception you add, include a comment in your <Match> block
explaining why this is not a bug.
-->
<FindBugsFilter>
<Match>
<!-- SQL db can return null for a boolean column; so can we. -->
<Class name="org.apache.hadoop.sqoop.lib.JdbcWritableBridge" />
<Method name="readBoolean" />
<Bug pattern="NP_BOOLEAN_RETURN_NULL" />
</Match>
<Match>
<!-- This mapper intentially triggers an NPE to cause an exception
which the test case much catch. -->
<Class name="org.apache.hadoop.sqoop.mapreduce.TestImportJob$NullDereferenceMapper" />
<Method name="map" />
<Bug pattern="NP_ALWAYS_NULL" />
</Match>
<!-- The following broad categories suppress warnings in test code that do
not need to be rigidly upheld. -->
<Match>
<!-- Performance warnings are ignored in test code. -->
<Class name="~org\.apache\.hadoop\.sqoop\..*Test.*" />
<Bug category="PERFORMANCE" />
</Match>
<Match>
<!-- More performance warnings to suppress in tests. -->
<Class name="~org\.apache\.hadoop\.sqoop\..*Test.*" />
<Bug pattern="SBSC_USE_STRINGBUFFER_CONCATENATION" />
</Match>
<Match>
<!-- Security warnings are ignored in test code. -->
<Class name="~org\.apache\.hadoop\.sqoop\..*Test.*" />
<Bug category="SECURITY" />
</Match>
<Match>
<!-- Ok to use methods to generate SQL statements in tests. -->
<Class name="~org\.apache\.hadoop\.sqoop\..*Test.*" />
<Bug pattern="SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING" />
</Match>
</FindBugsFilter>

2
src/test/org/apache/hadoop/sqoop/TestConnFactory.java
View File

@ -52,7 +52,7 @@ public void testExceptionForNoManager() {
ConnFactory factory = new ConnFactory(conf);
try {
ConnManager manager = factory.getManager(new SqoopOptions());
factory.getManager(new SqoopOptions());
fail("factory.getManager() expected to throw IOException");
} catch (IOException ioe) {
// Expected this. Test passes.

36
src/test/org/apache/hadoop/sqoop/TestExport.java
View File

@ -238,9 +238,12 @@ public void createTable(ColumnGenerator... extraColumns) throws SQLException {
PreparedStatement statement = conn.prepareStatement(
"DROP TABLE " + getTableName() + " IF EXISTS",
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
statement.executeUpdate();
conn.commit();
statement.close();
try {
statement.executeUpdate();
conn.commit();
} finally {
statement.close();
}
StringBuilder sb = new StringBuilder();
sb.append("CREATE TABLE ");
@ -254,9 +257,12 @@ public void createTable(ColumnGenerator... extraColumns) throws SQLException {
statement = conn.prepareStatement(sb.toString(),
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
statement.executeUpdate();
conn.commit();
statement.close();
try {
statement.executeUpdate();
conn.commit();
} finally {
statement.close();
}
}
/** Removing an existing table directory from the filesystem */
@ -278,12 +284,18 @@ private void assertColValForRowId(int id, String colName, String expectedVal)
PreparedStatement statement = conn.prepareStatement(
"SELECT " + colName + " FROM " + getTableName() + " WHERE id = " + id,
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
ResultSet rs = statement.executeQuery();
rs.next();
String actualVal = rs.getString(1);
rs.close();
statement.close();
String actualVal = null;
try {
ResultSet rs = statement.executeQuery();
try {
rs.next();
actualVal = rs.getString(1);
} finally {
rs.close();
}
} finally {
statement.close();
}
assertEquals("Got unexpected column value", expectedVal, actualVal);
}

86
src/test/org/apache/hadoop/sqoop/io/TestSplittableBufferedWriter.java
View File

@ -112,6 +112,11 @@ private void verifyFileContents(InputStream is, String [] lines)
r.readLine());
} finally {
r.close();
try {
is.close();
} catch (IOException ioe) {
// ignore IOE; may be closed by reader.
}
}
}
@ -128,15 +133,23 @@ private void verifyFileDoesNotExist(Path p) throws IOException {
public void testNonSplittingTextFile() throws IOException {
SplittingOutputStream os = new SplittingOutputStream(getConf(),
getWritePath(), "nonsplit-", 0, false);
SplittableBufferedWriter w = new SplittableBufferedWriter(os, true);
try {
w.allowSplit();
w.write("This is a string!");
w.newLine();
w.write("This is another string!");
w.allowSplit();
SplittableBufferedWriter w = new SplittableBufferedWriter(os, true);
try {
w.allowSplit();
w.write("This is a string!");
w.newLine();
w.write("This is another string!");
w.allowSplit();
} finally {
w.close();
}
} finally {
w.close();
try {
os.close();
} catch (IOException ioe) {
// Ignored; may be thrown because w is already closed.
}
}
// Ensure we made exactly one file.
@ -150,8 +163,18 @@ public void testNonSplittingTextFile() throws IOException {
"This is a string!",
"This is another string!",
};
verifyFileContents(new FileInputStream(new File(getWriteDir(),
"nonsplit-00000")), expectedLines);
InputStream fis = new FileInputStream(new File(getWriteDir(),
"nonsplit-00000"));
try {
verifyFileContents(fis, expectedLines);
} finally {
try {
fis.close();
} catch (IOException ioe) {
// Ignored; may be closed by verifyFileContents().
}
}
}
public void testNonSplittingGzipFile() throws IOException {
@ -187,14 +210,22 @@ public void testNonSplittingGzipFile() throws IOException {
public void testSplittingTextFile() throws IOException {
SplittingOutputStream os = new SplittingOutputStream(getConf(),
getWritePath(), "split-", 10, false);
SplittableBufferedWriter w = new SplittableBufferedWriter(os, true);
try {
w.allowSplit();
w.write("This is a string!");
w.newLine();
w.write("This is another string!");
SplittableBufferedWriter w = new SplittableBufferedWriter(os, true);
try {
w.allowSplit();
w.write("This is a string!");
w.newLine();
w.write("This is another string!");
} finally {
w.close();
}
} finally {
w.close();
try {
os.close();
} catch (IOException ioe) {
// Ignored; may be thrown because w is already closed.
}
}
// Ensure we made exactly two files.
@ -209,14 +240,31 @@ public void testSplittingTextFile() throws IOException {
String [] expectedLines0 = {
"This is a string!"
};
verifyFileContents(new FileInputStream(new File(getWriteDir(),
"split-00000")), expectedLines0);
InputStream fis = new FileInputStream(new File(getWriteDir(),
"split-00000"));
try {
verifyFileContents(fis, expectedLines0);
} finally {
try {
fis.close();
} catch (IOException ioe) {
// ignored; may be generated because fis closed in verifyFileContents.
}
}
String [] expectedLines1 = {
"This is another string!",
};
verifyFileContents(new FileInputStream(new File(getWriteDir(),
"split-00001")), expectedLines1);
fis = new FileInputStream(new File(getWriteDir(), "split-00001"));
try {
verifyFileContents(fis, expectedLines1);
} finally {
try {
fis.close();
} catch (IOException ioe) {
// Ignored; may be thrown because it's closed in verifyFileContents.
}
}
}
public void testSplittingGzipFile() throws IOException {

9
src/test/org/apache/hadoop/sqoop/lib/TestLargeObjectLoader.java
View File

@ -135,9 +135,10 @@ public void testReadBlobRef()
assertNotNull(blob);
assertFalse(blob.isExternal());
byte [] data = blob.getData();
assertEquals(MockResultSet.BLOB_DATA.length, data.length);
byte [] blobData = MockResultSet.BLOB_DATA();
assertEquals(blobData.length, data.length);
for (int i = 0; i < data.length; i++) {
assertEquals(MockResultSet.BLOB_DATA[i], data[i]);
assertEquals(blobData[i], data[i]);
}
// LOBs bigger than 4 bytes are now external.
@ -151,9 +152,9 @@ public void testReadBlobRef()
int bytes = is.read(buf, 0, 4096);
is.close();
assertEquals(MockResultSet.BLOB_DATA.length, bytes);
assertEquals(blobData.length, bytes);
for (int i = 0; i < bytes; i++) {
assertEquals(MockResultSet.BLOB_DATA[i], buf[i]);
assertEquals(blobData[i], buf[i]);
}
}
}

33
src/test/org/apache/hadoop/sqoop/lib/TestRecordParser.java
View File

@ -41,18 +41,20 @@ private void assertListsEqual(String msg, List<String> expected, List<String> ac
}
fail(msg);
}
if (expected == null && actual == null) {
} else if (expected == null && actual == null) {
return; // ok. Both null; nothing to do.
}
assert(null != expected);
assert(null != actual);
int expectedLen = expected.size();
int actualLen = actual.size();
if (expectedLen != actualLen) {
if (null == msg) {
msg = "Expected list of length " + expectedLen + "; got " + actualLen;
msg = "Expected list of length " + expectedLen
+ "; got " + actualLen;
}
fail(msg);
@ -63,17 +65,19 @@ private void assertListsEqual(String msg, List<String> expected, List<String> ac
String expectedElem = expected.get(i);
String actualElem = actual.get(i);
if (expectedElem == null && actualElem != null) {
if (null == msg) {
msg = "Expected null element at position " + i + "; got [" + actualElem + "]";
if (expectedElem == null) {
if (actualElem != null) {
if (null == msg) {
msg = "Expected null element at position " + i
+ "; got [" + actualElem + "]";
}
fail(msg);
}
fail(msg);
}
if (!expectedElem.equals(actualElem)) {
} else if (!expectedElem.equals(actualElem)) {
if (null == msg) {
msg = "Expected [" + expectedElem + "] at position " + i + "; got [" + actualElem + "]";
msg = "Expected [" + expectedElem + "] at position " + i
+ "; got [" + actualElem + "]";
}
fail(msg);
@ -235,7 +239,6 @@ public void testRequiredQuotes1() throws RecordParser.ParseError {
public void testRequiredQuotes2() throws RecordParser.ParseError {
RecordParser parser = new RecordParser(',', '\n', '\"', '\\', true);
String [] strings = { "field1", "field2" };
try {
parser.parseRecord("\"field1\",field2");
fail("Expected parse error for required quotes");
@ -246,7 +249,6 @@ public void testRequiredQuotes2() throws RecordParser.ParseError {
public void testRequiredQuotes3() throws RecordParser.ParseError {
RecordParser parser = new RecordParser(',', '\n', '\"', '\\', true);
String [] strings = { "field1", "field2" };
try {
parser.parseRecord("field1,\"field2\"");
fail("Expected parse error for required quotes");
@ -257,7 +259,6 @@ public void testRequiredQuotes3() throws RecordParser.ParseError {
public void testRequiredQuotes4() throws RecordParser.ParseError {
RecordParser parser = new RecordParser(',', '\n', '\"', '\\', true);
String [] strings = { "field1", "field2" };
try {
parser.parseRecord("field1,\"field2\"\n");
fail("Expected parse error for required quotes");

28
src/test/org/apache/hadoop/sqoop/manager/MySQLAuthTest.java
View File

@ -77,8 +77,14 @@ public class MySQLAuthTest extends ImportJobTestCase {
// instance variables populated during setUp, used during tests
private DirectMySQLManager manager;
@Override
protected boolean useHsqldbTestServer() {
return false;
}
@Before
public void setUp() {
super.setUp();
SqoopOptions options = new SqoopOptions(AUTH_CONNECT_STRING, AUTH_TABLE_NAME);
options.setUsername(AUTH_TEST_USER);
options.setPassword(AUTH_TEST_PASS);
@ -123,6 +129,7 @@ public void setUp() {
@After
public void tearDown() {
super.tearDown();
try {
manager.close();
} catch (SQLException sqlE) {
@ -242,15 +249,18 @@ private void dropTimestampTables() throws SQLException {
connection.setAutoCommit(false);
st = connection.createStatement();
st.executeUpdate("DROP TABLE IF EXISTS mysqlTimestampTable0");
st.executeUpdate("DROP TABLE IF EXISTS mysqlTimestampTable1");
st.executeUpdate("DROP TABLE IF EXISTS mysqlTimestampTable2");
st.executeUpdate("DROP TABLE IF EXISTS mysqlTimestampTable3");
st.executeUpdate("DROP TABLE IF EXISTS mysqlTimestampTable4");
st.executeUpdate("DROP TABLE IF EXISTS mysqlTimestampTable5");
connection.commit();
st.close();
connection.close();
try {
st.executeUpdate("DROP TABLE IF EXISTS mysqlTimestampTable0");
st.executeUpdate("DROP TABLE IF EXISTS mysqlTimestampTable1");
st.executeUpdate("DROP TABLE IF EXISTS mysqlTimestampTable2");
st.executeUpdate("DROP TABLE IF EXISTS mysqlTimestampTable3");
st.executeUpdate("DROP TABLE IF EXISTS mysqlTimestampTable4");
st.executeUpdate("DROP TABLE IF EXISTS mysqlTimestampTable5");
connection.commit();
} finally {
st.close();
connection.close();
}
}
public void doZeroTimestampTest(int testNum, boolean expectSuccess,

9
src/test/org/apache/hadoop/sqoop/manager/MySQLCompatTest.java
View File

@ -66,9 +66,12 @@ protected void dropTableIfExists(String table) throws SQLException {
PreparedStatement statement = conn.prepareStatement(
"DROP TABLE IF EXISTS " + table,
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
statement.executeUpdate();
statement.close();
conn.commit();
try {
statement.executeUpdate();
conn.commit();
} finally {
statement.close();
}
}
@Override

8
src/test/org/apache/hadoop/sqoop/manager/OracleManagerTest.java
View File

@ -89,9 +89,16 @@ public class OracleManagerTest extends ImportJobTestCase {
// instance variables populated during setUp, used during tests
private OracleManager manager;
@Override
protected boolean useHsqldbTestServer() {
return false;
}
@Before
public void setUp() {
super.setUp();
SqoopOptions options = new SqoopOptions(OracleUtils.CONNECT_STRING,
TABLE_NAME);
OracleUtils.setOracleAuth(options);
@ -152,6 +159,7 @@ public void setUp() {
@After
public void tearDown() {
super.tearDown();
try {
manager.close();
} catch (SQLException sqlE) {

7
src/test/org/apache/hadoop/sqoop/manager/PostgresqlTest.java
View File

@ -81,8 +81,15 @@ public class PostgresqlTest extends ImportJobTestCase {
static final String TABLE_NAME = "EMPLOYEES_PG";
static final String CONNECT_STRING = HOST_URL + DATABASE_NAME;
@Override
protected boolean useHsqldbTestServer() {
return false;
}
@Before
public void setUp() {
super.setUp();
LOG.debug("Setting up another postgresql test...");
SqoopOptions options = new SqoopOptions(CONNECT_STRING, TABLE_NAME);

15
src/test/org/apache/hadoop/sqoop/orm/TestClassWriter.java
View File

@ -297,11 +297,16 @@ public void testWeirdColumnNames() throws SQLException {
String tableName = HsqldbTestServer.getTableName();
Connection connection = testServer.getConnection();
Statement st = connection.createStatement();
st.executeUpdate("DROP TABLE " + tableName + " IF EXISTS");
st.executeUpdate("CREATE TABLE " + tableName + " (class INT, \"9field\" INT)");
st.executeUpdate("INSERT INTO " + tableName + " VALUES(42, 41)");
connection.commit();
connection.close();
try {
st.executeUpdate("DROP TABLE " + tableName + " IF EXISTS");
st.executeUpdate("CREATE TABLE " + tableName
+ " (class INT, \"9field\" INT)");
st.executeUpdate("INSERT INTO " + tableName + " VALUES(42, 41)");
connection.commit();
} finally {
st.close();
connection.close();
}
String [] argv = {
"--bindir",

9
src/test/org/apache/hadoop/sqoop/testutil/BaseSqoopTestCase.java
View File

@ -217,9 +217,12 @@ protected void dropTableIfExists(String table) throws SQLException {
PreparedStatement statement = conn.prepareStatement(
"DROP TABLE " + table + " IF EXISTS",
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
statement.executeUpdate();
statement.close();
conn.commit();
try {
statement.executeUpdate();
conn.commit();
} finally {
statement.close();
}
}
/**

86
src/test/org/apache/hadoop/sqoop/testutil/ExportJobTestCase.java
View File

@ -91,11 +91,18 @@ protected int getMinRowId() throws SQLException {
PreparedStatement statement = conn.prepareStatement(
"SELECT MIN(id) FROM " + getTableName(),
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
ResultSet rs = statement.executeQuery();
rs.next();
int minVal = rs.getInt(1);
rs.close();
statement.close();
int minVal = 0;
try {
ResultSet rs = statement.executeQuery();
try {
rs.next();
minVal = rs.getInt(1);
} finally {
rs.close();
}
} finally {
statement.close();
}
return minVal;
}
@ -106,11 +113,18 @@ protected int getMaxRowId() throws SQLException {
PreparedStatement statement = conn.prepareStatement(
"SELECT MAX(id) FROM " + getTableName(),
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
ResultSet rs = statement.executeQuery();
rs.next();
int maxVal = rs.getInt(1);
rs.close();
statement.close();
int maxVal = 0;
try {
ResultSet rs = statement.executeQuery();
try {
rs.next();
maxVal = rs.getInt(1);
} finally {
rs.close();
}
} finally {
statement.close();
}
return maxVal;
}
@ -128,11 +142,19 @@ protected void verifyExport(int expectedNumRecords) throws IOException, SQLExcep
PreparedStatement statement = conn.prepareStatement(
"SELECT COUNT(*) FROM " + getTableName(),
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
ResultSet rs = statement.executeQuery();
rs.next();
int actualNumRecords = rs.getInt(1);
rs.close();
statement.close();
int actualNumRecords = 0;
ResultSet rs = null;
try {
rs = statement.executeQuery();
try {
rs.next();
actualNumRecords = rs.getInt(1);
} finally {
rs.close();
}
} finally {
statement.close();
}
assertEquals("Got back unexpected row count", expectedNumRecords,
actualNumRecords);
@ -149,22 +171,36 @@ protected void verifyExport(int expectedNumRecords) throws IOException, SQLExcep
statement = conn.prepareStatement("SELECT msg FROM " + getTableName()
+ " WHERE id = " + minVal,
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
rs = statement.executeQuery();
rs.next();
String minMsg = rs.getString(1);
rs.close();
statement.close();
String minMsg = "";
try {
rs = statement.executeQuery();
try {
rs.next();
minMsg = rs.getString(1);
} finally {
rs.close();
}
} finally {
statement.close();
}
assertEquals("Invalid msg field for min value", getMsgPrefix() + minVal, minMsg);
statement = conn.prepareStatement("SELECT msg FROM " + getTableName()
+ " WHERE id = " + maxVal,
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
rs = statement.executeQuery();
rs.next();
String maxMsg = rs.getString(1);
rs.close();
statement.close();
String maxMsg = "";
try {
rs = statement.executeQuery();
try {
rs.next();
maxMsg = rs.getString(1);
} finally {
rs.close();
}
} finally {
statement.close();
}
assertEquals("Invalid msg field for min value", getMsgPrefix() + maxVal, maxMsg);
}

9
src/test/org/apache/hadoop/sqoop/testutil/HsqldbTestServer.java
View File

@ -209,9 +209,12 @@ public void dropExistingSchema() throws SQLException {
Connection conn = mgr.getConnection();
for (String table : tables) {
Statement s = conn.createStatement();
s.executeUpdate("DROP TABLE " + table);
conn.commit();
s.close();
try {
s.executeUpdate("DROP TABLE " + table);
conn.commit();
} finally {
s.close();
}
}
}
}

13
src/test/org/apache/hadoop/sqoop/testutil/MockResultSet.java
View File

@ -50,8 +50,10 @@
*/
public class MockResultSet implements ResultSet {
public static final byte [] BLOB_DATA = { 0x0, 0x1, 0x2, 0x3,
0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF };
public static final byte [] BLOB_DATA() {
return new byte[] { 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9,
0xA, 0xB, 0xC, 0xD, 0xE, 0xF };
}
public static final String CLOB_DATA = "This is the mock clob data!";
@ -60,7 +62,7 @@ public class MockResultSet implements ResultSet {
*/
public static class MockBlob implements Blob {
public InputStream getBinaryStream() {
return new ByteArrayInputStream(BLOB_DATA);
return new ByteArrayInputStream(BLOB_DATA());
}
public InputStream getBinaryStream(long pos, long len) {
@ -71,14 +73,15 @@ public InputStream getBinaryStream(long pos, long len) {
byte [] bytes = new byte[length];
int start = (int) pos - 1; // SQL uses 1-based arrays!!
byte [] blobData = BLOB_DATA();
for (int i = 0; i < length; i++) {
bytes[i] = BLOB_DATA[i + start];
bytes[i] = blobData[i + start];
}
return bytes;
}
public long length() {
return BLOB_DATA.length;
return BLOB_DATA().length;
}