Updated Branches: refs/heads/trunk 20af67ef6 -> 9de589e83
SQOOP-840: Inconsistent java generics declaration for exportwriter classes (Venkat Ranganathan via Jarek Jarcec Cecho) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/9de589e8 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/9de589e8 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/9de589e8 Branch: refs/heads/trunk Commit: 9de589e83cc23314df215d5713848c95b6ebaf1a Parents: 20af67e Author: Jarek Jarcec Cecho <[email protected]> Authored: Wed Jan 23 09:45:09 2013 -0800 Committer: Jarek Jarcec Cecho <[email protected]> Committed: Wed Jan 23 09:45:09 2013 -0800 ---------------------------------------------------------------------- .../sqoop/mapreduce/ExportOutputFormat.java | 2 +- .../sqoop/mapreduce/ExportBatchOutputFormat.java | 5 +++-- .../sqoop/mapreduce/OracleExportOutputFormat.java | 5 +++-- .../mapreduce/SQLServerExportOutputFormat.java | 5 +++-- .../SqlServerExportBatchOutputFormat.java | 7 ++++--- 5 files changed, 14 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/9de589e8/src/java/com/cloudera/sqoop/mapreduce/ExportOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/com/cloudera/sqoop/mapreduce/ExportOutputFormat.java b/src/java/com/cloudera/sqoop/mapreduce/ExportOutputFormat.java index 48c352b..2b99552 100644 --- a/src/java/com/cloudera/sqoop/mapreduce/ExportOutputFormat.java +++ b/src/java/com/cloudera/sqoop/mapreduce/ExportOutputFormat.java @@ -30,7 +30,7 @@ public class ExportOutputFormat<K extends SqoopRecord, V> extends org.apache.sqoop.mapreduce.ExportOutputFormat<K, V> { /** {@inheritDoc}. **/ - public class ExportRecordWriter extends + public class ExportRecordWriter<K extends SqoopRecord, V> extends org.apache.sqoop.mapreduce.ExportOutputFormat<K, V>.ExportRecordWriter { public ExportRecordWriter(TaskAttemptContext context) http://git-wip-us.apache.org/repos/asf/sqoop/blob/9de589e8/src/java/org/apache/sqoop/mapreduce/ExportBatchOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/ExportBatchOutputFormat.java b/src/java/org/apache/sqoop/mapreduce/ExportBatchOutputFormat.java index 20fc844..bc59eb9 100644 --- a/src/java/org/apache/sqoop/mapreduce/ExportBatchOutputFormat.java +++ b/src/java/org/apache/sqoop/mapreduce/ExportBatchOutputFormat.java @@ -45,7 +45,7 @@ public class ExportBatchOutputFormat<K extends SqoopRecord, V> public RecordWriter<K, V> getRecordWriter(TaskAttemptContext context) throws IOException { try { - return new ExportBatchRecordWriter(context); + return new ExportBatchRecordWriter<K, V>(context); } catch (Exception e) { throw new IOException(e); } @@ -55,7 +55,8 @@ public class ExportBatchOutputFormat<K extends SqoopRecord, V> * RecordWriter to write the output to a row in a database table. * The actual database updates are executed in a second thread. */ - public class ExportBatchRecordWriter extends ExportRecordWriter { + public class ExportBatchRecordWriter<K extends SqoopRecord, V> + extends ExportRecordWriter<K, V> { public ExportBatchRecordWriter(TaskAttemptContext context) throws ClassNotFoundException, SQLException { http://git-wip-us.apache.org/repos/asf/sqoop/blob/9de589e8/src/java/org/apache/sqoop/mapreduce/OracleExportOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/OracleExportOutputFormat.java b/src/java/org/apache/sqoop/mapreduce/OracleExportOutputFormat.java index 8e9cf1d..fb667f6 100644 --- a/src/java/org/apache/sqoop/mapreduce/OracleExportOutputFormat.java +++ b/src/java/org/apache/sqoop/mapreduce/OracleExportOutputFormat.java @@ -36,7 +36,7 @@ public class OracleExportOutputFormat<K extends SqoopRecord, V> public RecordWriter<K, V> getRecordWriter(TaskAttemptContext context) throws IOException { try { - return new OracleExportRecordWriter(context); + return new OracleExportRecordWriter<K, V>(context); } catch (Exception e) { throw new IOException(e); } @@ -46,7 +46,8 @@ public class OracleExportOutputFormat<K extends SqoopRecord, V> * RecordWriter to write the output to a row in a database table. * The actual database updates are executed in a second thread. */ - public class OracleExportRecordWriter extends ExportRecordWriter { + public class OracleExportRecordWriter<K extends SqoopRecord, V> + extends ExportRecordWriter<K, V> { public OracleExportRecordWriter(TaskAttemptContext context) throws ClassNotFoundException, SQLException { http://git-wip-us.apache.org/repos/asf/sqoop/blob/9de589e8/src/java/org/apache/sqoop/mapreduce/SQLServerExportOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/SQLServerExportOutputFormat.java b/src/java/org/apache/sqoop/mapreduce/SQLServerExportOutputFormat.java index 1b39519..ead7fb2 100644 --- a/src/java/org/apache/sqoop/mapreduce/SQLServerExportOutputFormat.java +++ b/src/java/org/apache/sqoop/mapreduce/SQLServerExportOutputFormat.java @@ -36,7 +36,7 @@ public class SQLServerExportOutputFormat<K extends SqoopRecord, V> public RecordWriter<K, V> getRecordWriter(TaskAttemptContext context) throws IOException { try { - return new SQLServerExportRecordWriter(context); + return new SQLServerExportRecordWriter<K, V>(context); } catch (Exception e) { throw new IOException(e); } @@ -46,7 +46,8 @@ public class SQLServerExportOutputFormat<K extends SqoopRecord, V> * RecordWriter to write the output to a row in a database table. * The actual database updates are executed in a second thread. */ - public class SQLServerExportRecordWriter extends ExportRecordWriter { + public class SQLServerExportRecordWriter<K extends SqoopRecord, V> + extends ExportRecordWriter<K, V> { public SQLServerExportRecordWriter(TaskAttemptContext context) throws ClassNotFoundException, SQLException { http://git-wip-us.apache.org/repos/asf/sqoop/blob/9de589e8/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerExportBatchOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerExportBatchOutputFormat.java b/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerExportBatchOutputFormat.java index f47d475..cc69d77 100644 --- a/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerExportBatchOutputFormat.java +++ b/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerExportBatchOutputFormat.java @@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFactory; * Output format specific for Microsoft SQL Connector. */ public class SqlServerExportBatchOutputFormat<K extends SqoopRecord, V> - extends ExportBatchOutputFormat { + extends ExportBatchOutputFormat<K, V> { private static final Log LOG = LogFactory.getLog(SqlServerExportBatchOutputFormat.class); @@ -42,14 +42,15 @@ public class SqlServerExportBatchOutputFormat<K extends SqoopRecord, V> public RecordWriter<K, V> getRecordWriter(TaskAttemptContext context) throws IOException { try { - return new SqlServerExportBatchRecordWriter(context); + return new SqlServerExportBatchRecordWriter<K, V>(context); } catch (Exception e) { throw new IOException(e); } } /** {@inheritDoc}. */ - public class SqlServerExportBatchRecordWriter extends ExportBatchRecordWriter{ + public class SqlServerExportBatchRecordWriter<K extends SqoopRecord, V> + extends ExportBatchRecordWriter<K, V>{ public SqlServerExportBatchRecordWriter(TaskAttemptContext context) throws ClassNotFoundException, SQLException {
