http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/MergeAvroReducer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/MergeAvroReducer.java b/src/java/org/apache/sqoop/mapreduce/MergeAvroReducer.java index 2e85f51..f0403a0 100644 --- a/src/java/org/apache/sqoop/mapreduce/MergeAvroReducer.java +++ b/src/java/org/apache/sqoop/mapreduce/MergeAvroReducer.java @@ -24,7 +24,7 @@ import org.apache.avro.generic.GenericRecord; import org.apache.avro.mapred.AvroWrapper; import org.apache.hadoop.io.NullWritable; import org.apache.sqoop.avro.AvroUtil; -import com.cloudera.sqoop.lib.SqoopRecord; +import org.apache.sqoop.lib.SqoopRecord; public class MergeAvroReducer extends MergeReducerBase<AvroWrapper<GenericRecord>, NullWritable> { private AvroWrapper<GenericRecord> wrapper;
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/MergeGenericRecordExportMapper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/MergeGenericRecordExportMapper.java b/src/java/org/apache/sqoop/mapreduce/MergeGenericRecordExportMapper.java index 31d56a5..6d8b4b5 100644 --- a/src/java/org/apache/sqoop/mapreduce/MergeGenericRecordExportMapper.java +++ b/src/java/org/apache/sqoop/mapreduce/MergeGenericRecordExportMapper.java @@ -28,7 +28,7 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.mapreduce.lib.input.FileSplit; -import com.cloudera.sqoop.lib.SqoopRecord; +import org.apache.sqoop.lib.SqoopRecord; public class MergeGenericRecordExportMapper<K, V> extends AutoProgressMapper<K, V, Text, MergeRecord> { http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/MergeJob.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/MergeJob.java b/src/java/org/apache/sqoop/mapreduce/MergeJob.java index c6be189..bb21b64 100644 --- a/src/java/org/apache/sqoop/mapreduce/MergeJob.java +++ b/src/java/org/apache/sqoop/mapreduce/MergeJob.java @@ -56,8 +56,8 @@ import parquet.hadoop.Footer; import parquet.hadoop.ParquetFileReader; import parquet.schema.MessageType; -import com.cloudera.sqoop.SqoopOptions; -import com.cloudera.sqoop.mapreduce.JobBase; +import org.apache.sqoop.SqoopOptions; +import org.apache.sqoop.mapreduce.JobBase; import org.apache.sqoop.util.FileSystemUtil; /** http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/MergeMapperBase.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/MergeMapperBase.java b/src/java/org/apache/sqoop/mapreduce/MergeMapperBase.java index c4fd9f7..4657e0a 100644 --- a/src/java/org/apache/sqoop/mapreduce/MergeMapperBase.java +++ b/src/java/org/apache/sqoop/mapreduce/MergeMapperBase.java @@ -28,7 +28,7 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.mapreduce.Mapper; import org.apache.hadoop.mapreduce.lib.input.FileSplit; -import com.cloudera.sqoop.lib.SqoopRecord; +import org.apache.sqoop.lib.SqoopRecord; /** * Given a set of SqoopRecord instances which are from a "new" dataset http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/MergeParquetMapper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/MergeParquetMapper.java b/src/java/org/apache/sqoop/mapreduce/MergeParquetMapper.java index 8a5a7ca..42016f2 100644 --- a/src/java/org/apache/sqoop/mapreduce/MergeParquetMapper.java +++ b/src/java/org/apache/sqoop/mapreduce/MergeParquetMapper.java @@ -33,7 +33,7 @@ import java.util.Map; import org.apache.avro.mapred.Pair; import org.apache.sqoop.avro.AvroUtil; -import com.cloudera.sqoop.lib.SqoopRecord; +import org.apache.sqoop.lib.SqoopRecord; public class MergeParquetMapper http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/MergeParquetReducer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/MergeParquetReducer.java b/src/java/org/apache/sqoop/mapreduce/MergeParquetReducer.java index 293ffc9..caa4f5f 100644 --- a/src/java/org/apache/sqoop/mapreduce/MergeParquetReducer.java +++ b/src/java/org/apache/sqoop/mapreduce/MergeParquetReducer.java @@ -33,7 +33,7 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.Reducer; import org.apache.sqoop.avro.AvroUtil; -import com.cloudera.sqoop.lib.SqoopRecord; +import org.apache.sqoop.lib.SqoopRecord; public class MergeParquetReducer extends Reducer<Text, MergeRecord,GenericRecord,NullWritable> { http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/MergeRecord.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/MergeRecord.java b/src/java/org/apache/sqoop/mapreduce/MergeRecord.java index d73112c..08f43d1 100644 --- a/src/java/org/apache/sqoop/mapreduce/MergeRecord.java +++ b/src/java/org/apache/sqoop/mapreduce/MergeRecord.java @@ -25,7 +25,7 @@ import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.apache.hadoop.io.Writable; -import com.cloudera.sqoop.lib.SqoopRecord; +import org.apache.sqoop.lib.SqoopRecord; /** * Class that holds a record to be merged. This contains a SqoopRecord which http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/MergeRecordMapper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/MergeRecordMapper.java b/src/java/org/apache/sqoop/mapreduce/MergeRecordMapper.java index bfab0c6..9098fab 100644 --- a/src/java/org/apache/sqoop/mapreduce/MergeRecordMapper.java +++ b/src/java/org/apache/sqoop/mapreduce/MergeRecordMapper.java @@ -20,8 +20,7 @@ package org.apache.sqoop.mapreduce; import java.io.IOException; import org.apache.hadoop.io.LongWritable; -import com.cloudera.sqoop.lib.SqoopRecord; -import com.cloudera.sqoop.mapreduce.MergeMapperBase; +import org.apache.sqoop.lib.SqoopRecord; /** * Mapper for the merge program which operates on SequenceFiles. http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/MergeReducer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/MergeReducer.java b/src/java/org/apache/sqoop/mapreduce/MergeReducer.java index 6192cdb..02d1be7 100644 --- a/src/java/org/apache/sqoop/mapreduce/MergeReducer.java +++ b/src/java/org/apache/sqoop/mapreduce/MergeReducer.java @@ -22,7 +22,7 @@ import java.io.IOException; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.Reducer; -import com.cloudera.sqoop.lib.SqoopRecord; +import org.apache.sqoop.lib.SqoopRecord; /** * Reducer for merge tool. Given records tagged as 'old' or 'new', emit http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/MergeReducerBase.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/MergeReducerBase.java b/src/java/org/apache/sqoop/mapreduce/MergeReducerBase.java index 4af498f..de3d612 100644 --- a/src/java/org/apache/sqoop/mapreduce/MergeReducerBase.java +++ b/src/java/org/apache/sqoop/mapreduce/MergeReducerBase.java @@ -23,7 +23,7 @@ import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.Reducer; import org.apache.hadoop.mapreduce.Reducer.Context; -import com.cloudera.sqoop.lib.SqoopRecord; +import org.apache.sqoop.lib.SqoopRecord; public abstract class MergeReducerBase<KEYOUT, VALUEOUT> extends Reducer<Text, MergeRecord, KEYOUT, VALUEOUT> { http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/MergeTextMapper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/MergeTextMapper.java b/src/java/org/apache/sqoop/mapreduce/MergeTextMapper.java index c66067e..ef95080 100644 --- a/src/java/org/apache/sqoop/mapreduce/MergeTextMapper.java +++ b/src/java/org/apache/sqoop/mapreduce/MergeTextMapper.java @@ -23,9 +23,8 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.util.ReflectionUtils; -import com.cloudera.sqoop.lib.RecordParser; -import com.cloudera.sqoop.lib.SqoopRecord; -import com.cloudera.sqoop.mapreduce.MergeMapperBase; +import org.apache.sqoop.lib.RecordParser; +import org.apache.sqoop.lib.SqoopRecord; /** * Mapper for the merge program which operates on text files that we need to http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/MySQLDumpImportJob.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/MySQLDumpImportJob.java b/src/java/org/apache/sqoop/mapreduce/MySQLDumpImportJob.java index 43fbec4..19e50aa 100644 --- a/src/java/org/apache/sqoop/mapreduce/MySQLDumpImportJob.java +++ b/src/java/org/apache/sqoop/mapreduce/MySQLDumpImportJob.java @@ -24,12 +24,12 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.Job; -import com.cloudera.sqoop.SqoopOptions; -import com.cloudera.sqoop.manager.ConnManager; -import com.cloudera.sqoop.manager.ImportJobContext; -import com.cloudera.sqoop.manager.MySQLUtils; -import com.cloudera.sqoop.mapreduce.db.DBConfiguration; -import com.cloudera.sqoop.mapreduce.db.DataDrivenDBInputFormat; +import org.apache.sqoop.SqoopOptions; +import org.apache.sqoop.manager.ConnManager; +import org.apache.sqoop.manager.ImportJobContext; +import org.apache.sqoop.manager.MySQLUtils; +import org.apache.sqoop.mapreduce.db.DBConfiguration; +import org.apache.sqoop.mapreduce.db.DataDrivenDBInputFormat; /** * Class that runs an import job using mysqldump in the mapper. http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/MySQLDumpInputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/MySQLDumpInputFormat.java b/src/java/org/apache/sqoop/mapreduce/MySQLDumpInputFormat.java index 72068a7..95825b3 100644 --- a/src/java/org/apache/sqoop/mapreduce/MySQLDumpInputFormat.java +++ b/src/java/org/apache/sqoop/mapreduce/MySQLDumpInputFormat.java @@ -24,7 +24,7 @@ import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.mapreduce.RecordReader; import org.apache.hadoop.mapreduce.TaskAttemptContext; -import com.cloudera.sqoop.mapreduce.db.DataDrivenDBInputFormat; +import org.apache.sqoop.mapreduce.db.DataDrivenDBInputFormat; /** * InputFormat designed to take data-driven splits and feed them to a mysqldump http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/MySQLDumpMapper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/MySQLDumpMapper.java b/src/java/org/apache/sqoop/mapreduce/MySQLDumpMapper.java index aeeb137..790dad4 100644 --- a/src/java/org/apache/sqoop/mapreduce/MySQLDumpMapper.java +++ b/src/java/org/apache/sqoop/mapreduce/MySQLDumpMapper.java @@ -35,13 +35,13 @@ import org.apache.sqoop.util.AsyncSink; import org.apache.sqoop.util.JdbcUrl; import org.apache.sqoop.util.PerfCounters; import org.apache.sqoop.mapreduce.db.DBConfiguration; -import com.cloudera.sqoop.lib.DelimiterSet; -import com.cloudera.sqoop.lib.FieldFormatter; -import com.cloudera.sqoop.lib.RecordParser; -import com.cloudera.sqoop.manager.MySQLUtils; -import com.cloudera.sqoop.util.ErrorableAsyncSink; -import com.cloudera.sqoop.util.ErrorableThread; -import com.cloudera.sqoop.util.LoggingAsyncSink; +import org.apache.sqoop.lib.DelimiterSet; +import org.apache.sqoop.lib.FieldFormatter; +import org.apache.sqoop.lib.RecordParser; +import org.apache.sqoop.manager.MySQLUtils; +import org.apache.sqoop.util.ErrorableAsyncSink; +import org.apache.sqoop.util.ErrorableThread; +import org.apache.sqoop.util.LoggingAsyncSink; /** * Mapper that opens up a pipe to mysqldump and pulls data directly. http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/MySQLExportJob.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/MySQLExportJob.java b/src/java/org/apache/sqoop/mapreduce/MySQLExportJob.java index 16bdd74..e17f3df 100644 --- a/src/java/org/apache/sqoop/mapreduce/MySQLExportJob.java +++ b/src/java/org/apache/sqoop/mapreduce/MySQLExportJob.java @@ -25,12 +25,11 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.Mapper; import org.apache.hadoop.mapreduce.lib.output.NullOutputFormat; -import com.cloudera.sqoop.manager.ConnManager; -import com.cloudera.sqoop.manager.ExportJobContext; -import com.cloudera.sqoop.manager.MySQLUtils; -import com.cloudera.sqoop.mapreduce.ExportJobBase; -import com.cloudera.sqoop.mapreduce.db.DBConfiguration; -import com.cloudera.sqoop.mapreduce.db.DataDrivenDBInputFormat; +import org.apache.sqoop.manager.ConnManager; +import org.apache.sqoop.manager.ExportJobContext; +import org.apache.sqoop.manager.MySQLUtils; +import org.apache.sqoop.mapreduce.db.DBConfiguration; +import org.apache.sqoop.mapreduce.db.DataDrivenDBInputFormat; /** * Class that runs an export job using mysqlimport in the mapper. http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/MySQLExportMapper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/MySQLExportMapper.java b/src/java/org/apache/sqoop/mapreduce/MySQLExportMapper.java index 0cfb0b3..bb751ee 100644 --- a/src/java/org/apache/sqoop/mapreduce/MySQLExportMapper.java +++ b/src/java/org/apache/sqoop/mapreduce/MySQLExportMapper.java @@ -34,9 +34,9 @@ import org.apache.sqoop.util.JdbcUrl; import org.apache.sqoop.util.LoggingAsyncSink; import org.apache.sqoop.util.NullAsyncSink; import org.apache.sqoop.util.TaskId; -import com.cloudera.sqoop.io.NamedFifo; -import com.cloudera.sqoop.mapreduce.db.DBConfiguration; -import com.cloudera.sqoop.manager.MySQLUtils; +import org.apache.sqoop.io.NamedFifo; +import org.apache.sqoop.mapreduce.db.DBConfiguration; +import org.apache.sqoop.manager.MySQLUtils; /** * Mapper that starts a 'mysqlimport' process and uses that to export rows from http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/MySQLRecordExportMapper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/MySQLRecordExportMapper.java b/src/java/org/apache/sqoop/mapreduce/MySQLRecordExportMapper.java index d2d0c61..2b39c01 100644 --- a/src/java/org/apache/sqoop/mapreduce/MySQLRecordExportMapper.java +++ b/src/java/org/apache/sqoop/mapreduce/MySQLRecordExportMapper.java @@ -20,8 +20,7 @@ package org.apache.sqoop.mapreduce; import java.io.IOException; import org.apache.hadoop.io.LongWritable; -import com.cloudera.sqoop.lib.SqoopRecord; -import com.cloudera.sqoop.mapreduce.MySQLExportMapper; +import org.apache.sqoop.lib.SqoopRecord; /** * mysqlimport-based exporter which accepts SqoopRecords (e.g., from http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/MySQLTextExportMapper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/MySQLTextExportMapper.java b/src/java/org/apache/sqoop/mapreduce/MySQLTextExportMapper.java index b2fb035..6165c52 100644 --- a/src/java/org/apache/sqoop/mapreduce/MySQLTextExportMapper.java +++ b/src/java/org/apache/sqoop/mapreduce/MySQLTextExportMapper.java @@ -21,8 +21,7 @@ package org.apache.sqoop.mapreduce; import java.io.IOException; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; -import com.cloudera.sqoop.manager.MySQLUtils; -import com.cloudera.sqoop.mapreduce.MySQLExportMapper; +import org.apache.sqoop.manager.MySQLUtils; /** * mysqlimport-based exporter which accepts lines of text from files http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/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 fb667f6..059fbfc 100644 --- a/src/java/org/apache/sqoop/mapreduce/OracleExportOutputFormat.java +++ b/src/java/org/apache/sqoop/mapreduce/OracleExportOutputFormat.java @@ -22,8 +22,7 @@ import java.io.IOException; import java.sql.SQLException; import org.apache.hadoop.mapreduce.RecordWriter; import org.apache.hadoop.mapreduce.TaskAttemptContext; -import com.cloudera.sqoop.lib.SqoopRecord; -import com.cloudera.sqoop.mapreduce.ExportOutputFormat; +import org.apache.sqoop.lib.SqoopRecord; /** * Oracle-specific SQL formatting overrides default ExportOutputFormat's. @@ -47,7 +46,7 @@ public class OracleExportOutputFormat<K extends SqoopRecord, V> * The actual database updates are executed in a second thread. */ public class OracleExportRecordWriter<K extends SqoopRecord, V> - extends ExportRecordWriter<K, V> { + extends ExportRecordWriter { public OracleExportRecordWriter(TaskAttemptContext context) throws ClassNotFoundException, SQLException { http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/OracleUpsertOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/OracleUpsertOutputFormat.java b/src/java/org/apache/sqoop/mapreduce/OracleUpsertOutputFormat.java index 79a4efd..95e5e31 100644 --- a/src/java/org/apache/sqoop/mapreduce/OracleUpsertOutputFormat.java +++ b/src/java/org/apache/sqoop/mapreduce/OracleUpsertOutputFormat.java @@ -27,8 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.mapreduce.RecordWriter; import org.apache.hadoop.mapreduce.TaskAttemptContext; -import com.cloudera.sqoop.lib.SqoopRecord; -import com.cloudera.sqoop.mapreduce.UpdateOutputFormat; +import org.apache.sqoop.lib.SqoopRecord; import org.apache.sqoop.manager.oracle.OracleUtils; /** http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/ParquetImportMapper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/ParquetImportMapper.java b/src/java/org/apache/sqoop/mapreduce/ParquetImportMapper.java index 45211fc..35ab495 100644 --- a/src/java/org/apache/sqoop/mapreduce/ParquetImportMapper.java +++ b/src/java/org/apache/sqoop/mapreduce/ParquetImportMapper.java @@ -18,9 +18,8 @@ package org.apache.sqoop.mapreduce; -import com.cloudera.sqoop.lib.LargeObjectLoader; -import com.cloudera.sqoop.lib.SqoopRecord; -import com.cloudera.sqoop.mapreduce.AutoProgressMapper; +import org.apache.sqoop.lib.LargeObjectLoader; +import org.apache.sqoop.lib.SqoopRecord; import org.apache.avro.Schema; import org.apache.avro.generic.GenericRecord; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/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 ead7fb2..6feb34a 100644 --- a/src/java/org/apache/sqoop/mapreduce/SQLServerExportOutputFormat.java +++ b/src/java/org/apache/sqoop/mapreduce/SQLServerExportOutputFormat.java @@ -22,8 +22,7 @@ import java.io.IOException; import java.sql.SQLException; import org.apache.hadoop.mapreduce.RecordWriter; import org.apache.hadoop.mapreduce.TaskAttemptContext; -import com.cloudera.sqoop.lib.SqoopRecord; -import com.cloudera.sqoop.mapreduce.ExportOutputFormat; +import org.apache.sqoop.lib.SqoopRecord; /** * SQLServer-specific SQL formatting overrides default ExportOutputFormat's. @@ -47,7 +46,7 @@ public class SQLServerExportOutputFormat<K extends SqoopRecord, V> * The actual database updates are executed in a second thread. */ public class SQLServerExportRecordWriter<K extends SqoopRecord, V> - extends ExportRecordWriter<K, V> { + extends ExportRecordWriter { public SQLServerExportRecordWriter(TaskAttemptContext context) throws ClassNotFoundException, SQLException { http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/SequenceFileExportMapper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/SequenceFileExportMapper.java b/src/java/org/apache/sqoop/mapreduce/SequenceFileExportMapper.java index 434d7d3..e9d1b83 100644 --- a/src/java/org/apache/sqoop/mapreduce/SequenceFileExportMapper.java +++ b/src/java/org/apache/sqoop/mapreduce/SequenceFileExportMapper.java @@ -21,8 +21,7 @@ package org.apache.sqoop.mapreduce; import java.io.IOException; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.NullWritable; -import com.cloudera.sqoop.lib.SqoopRecord; -import com.cloudera.sqoop.mapreduce.AutoProgressMapper; +import org.apache.sqoop.lib.SqoopRecord; /** * Reads a SqoopRecord from the SequenceFile in which it's packed and emits http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/SequenceFileImportMapper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/SequenceFileImportMapper.java b/src/java/org/apache/sqoop/mapreduce/SequenceFileImportMapper.java index 96b523e..461a095 100644 --- a/src/java/org/apache/sqoop/mapreduce/SequenceFileImportMapper.java +++ b/src/java/org/apache/sqoop/mapreduce/SequenceFileImportMapper.java @@ -22,9 +22,8 @@ import java.io.IOException; import java.sql.SQLException; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; -import com.cloudera.sqoop.lib.LargeObjectLoader; -import com.cloudera.sqoop.lib.SqoopRecord; -import com.cloudera.sqoop.mapreduce.AutoProgressMapper; +import org.apache.sqoop.lib.LargeObjectLoader; +import org.apache.sqoop.lib.SqoopRecord; /** * Imports records by writing them to a SequenceFile. http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/TextExportMapper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/TextExportMapper.java b/src/java/org/apache/sqoop/mapreduce/TextExportMapper.java index 7e05d42..691ccee 100644 --- a/src/java/org/apache/sqoop/mapreduce/TextExportMapper.java +++ b/src/java/org/apache/sqoop/mapreduce/TextExportMapper.java @@ -26,8 +26,7 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.mapreduce.lib.input.FileSplit; import org.apache.hadoop.util.ReflectionUtils; -import com.cloudera.sqoop.lib.SqoopRecord; -import com.cloudera.sqoop.mapreduce.AutoProgressMapper; +import org.apache.sqoop.lib.SqoopRecord; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/TextImportMapper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/TextImportMapper.java b/src/java/org/apache/sqoop/mapreduce/TextImportMapper.java index 6f52907..af99509 100644 --- a/src/java/org/apache/sqoop/mapreduce/TextImportMapper.java +++ b/src/java/org/apache/sqoop/mapreduce/TextImportMapper.java @@ -25,9 +25,8 @@ import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; -import com.cloudera.sqoop.lib.LargeObjectLoader; -import com.cloudera.sqoop.lib.SqoopRecord; -import com.cloudera.sqoop.mapreduce.AutoProgressMapper; +import org.apache.sqoop.lib.LargeObjectLoader; +import org.apache.sqoop.lib.SqoopRecord; /** * Imports records by transforming them to strings for a plain-text flat file. http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/UpdateOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/UpdateOutputFormat.java b/src/java/org/apache/sqoop/mapreduce/UpdateOutputFormat.java index 96cec17..52305d9 100644 --- a/src/java/org/apache/sqoop/mapreduce/UpdateOutputFormat.java +++ b/src/java/org/apache/sqoop/mapreduce/UpdateOutputFormat.java @@ -33,9 +33,8 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.JobContext; import org.apache.hadoop.mapreduce.RecordWriter; import org.apache.hadoop.mapreduce.TaskAttemptContext; -import com.cloudera.sqoop.lib.SqoopRecord; -import com.cloudera.sqoop.mapreduce.AsyncSqlOutputFormat; -import com.cloudera.sqoop.mapreduce.db.DBConfiguration; +import org.apache.sqoop.lib.SqoopRecord; +import org.apache.sqoop.mapreduce.db.DBConfiguration; /** * Update an existing table of data with new value data. http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/cubrid/CubridUpsertOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/cubrid/CubridUpsertOutputFormat.java b/src/java/org/apache/sqoop/mapreduce/cubrid/CubridUpsertOutputFormat.java index 46b048f..84dd6b5 100644 --- a/src/java/org/apache/sqoop/mapreduce/cubrid/CubridUpsertOutputFormat.java +++ b/src/java/org/apache/sqoop/mapreduce/cubrid/CubridUpsertOutputFormat.java @@ -25,8 +25,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.mapreduce.RecordWriter; import org.apache.hadoop.mapreduce.TaskAttemptContext; -import com.cloudera.sqoop.lib.SqoopRecord; -import com.cloudera.sqoop.mapreduce.UpdateOutputFormat; +import org.apache.sqoop.lib.SqoopRecord; +import org.apache.sqoop.mapreduce.UpdateOutputFormat; /** * Output format for CUBRID Update/insert functionality. We will use CUBID http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/db/BigDecimalSplitter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/db/BigDecimalSplitter.java b/src/java/org/apache/sqoop/mapreduce/db/BigDecimalSplitter.java index a8db2a3..f7de6f4 100644 --- a/src/java/org/apache/sqoop/mapreduce/db/BigDecimalSplitter.java +++ b/src/java/org/apache/sqoop/mapreduce/db/BigDecimalSplitter.java @@ -28,9 +28,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.InputSplit; -import com.cloudera.sqoop.config.ConfigurationHelper; -import com.cloudera.sqoop.mapreduce.db.DBSplitter; -import com.cloudera.sqoop.mapreduce.db.DataDrivenDBInputFormat; +import org.apache.sqoop.config.ConfigurationHelper; import org.apache.sqoop.validation.ValidationException; /** http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/db/BooleanSplitter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/db/BooleanSplitter.java b/src/java/org/apache/sqoop/mapreduce/db/BooleanSplitter.java index 122bb8f..c345b34 100644 --- a/src/java/org/apache/sqoop/mapreduce/db/BooleanSplitter.java +++ b/src/java/org/apache/sqoop/mapreduce/db/BooleanSplitter.java @@ -25,9 +25,6 @@ import java.util.List; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.InputSplit; -import com.cloudera.sqoop.mapreduce.db.DBSplitter; -import com.cloudera.sqoop.mapreduce.db.DataDrivenDBInputFormat; - /** * Implement DBSplitter over boolean values. */ http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/db/DBConfiguration.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/db/DBConfiguration.java b/src/java/org/apache/sqoop/mapreduce/db/DBConfiguration.java index a9b7e42..ac90099 100644 --- a/src/java/org/apache/sqoop/mapreduce/db/DBConfiguration.java +++ b/src/java/org/apache/sqoop/mapreduce/db/DBConfiguration.java @@ -35,8 +35,6 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.JobConf; import org.apache.sqoop.mapreduce.DBWritable; -import com.cloudera.sqoop.mapreduce.db.DBInputFormat.NullDBWritable; - /** * A container for configuration property names for jobs with DB input/output. * @@ -401,7 +399,7 @@ public class DBConfiguration { public Class<?> getInputClass() { return conf.getClass(DBConfiguration.INPUT_CLASS_PROPERTY, - NullDBWritable.class); + DBInputFormat.NullDBWritable.class); } public void setInputClass(Class<? extends DBWritable> inputClass) { http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/db/DBInputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/db/DBInputFormat.java b/src/java/org/apache/sqoop/mapreduce/db/DBInputFormat.java index 0a2e396..f4cd7f6 100644 --- a/src/java/org/apache/sqoop/mapreduce/db/DBInputFormat.java +++ b/src/java/org/apache/sqoop/mapreduce/db/DBInputFormat.java @@ -43,10 +43,7 @@ import org.apache.hadoop.mapreduce.RecordReader; import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.sqoop.mapreduce.DBWritable; -import com.cloudera.sqoop.config.ConfigurationHelper; -import com.cloudera.sqoop.mapreduce.db.DBConfiguration; -import com.cloudera.sqoop.mapreduce.db.DBRecordReader; -import com.cloudera.sqoop.mapreduce.db.OracleDBRecordReader; +import org.apache.sqoop.config.ConfigurationHelper; /** * A InputFormat that reads input data from an SQL table. @@ -230,7 +227,7 @@ extends InputFormat<LongWritable, T> implements Configurable { } protected RecordReader<LongWritable, T> createDBRecordReader( - com.cloudera.sqoop.mapreduce.db.DBInputFormat.DBInputSplit split, + DBInputFormat.DBInputSplit split, Configuration conf) throws IOException { @SuppressWarnings("unchecked") @@ -264,7 +261,7 @@ extends InputFormat<LongWritable, T> implements Configurable { TaskAttemptContext context) throws IOException, InterruptedException { return createDBRecordReader( - (com.cloudera.sqoop.mapreduce.db.DBInputFormat.DBInputSplit) split, + (DBInputFormat.DBInputSplit) split, context.getConfiguration()); } http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/db/DBOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/db/DBOutputFormat.java b/src/java/org/apache/sqoop/mapreduce/db/DBOutputFormat.java index f86ad2d..730ff28 100644 --- a/src/java/org/apache/sqoop/mapreduce/db/DBOutputFormat.java +++ b/src/java/org/apache/sqoop/mapreduce/db/DBOutputFormat.java @@ -35,8 +35,7 @@ import org.apache.hadoop.mapreduce.lib.output.FileOutputCommitter; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; import org.apache.hadoop.util.StringUtils; -import com.cloudera.sqoop.config.ConfigurationHelper; -import com.cloudera.sqoop.mapreduce.db.DBConfiguration; +import org.apache.sqoop.config.ConfigurationHelper; import org.apache.sqoop.util.LoggingUtils; /** @@ -119,7 +118,7 @@ public class DBOutputFormat<K extends DBWritable, V> statement = connection.prepareStatement( constructQuery(tableName, fieldNames)); - return new com.cloudera.sqoop.mapreduce.db.DBOutputFormat.DBRecordWriter( + return new org.apache.sqoop.mapreduce.db.DBOutputFormat.DBRecordWriter( connection, statement); } catch (Exception ex) { throw new IOException(ex); http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/db/DBRecordReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/db/DBRecordReader.java b/src/java/org/apache/sqoop/mapreduce/db/DBRecordReader.java index eed5780..0ae324e 100644 --- a/src/java/org/apache/sqoop/mapreduce/db/DBRecordReader.java +++ b/src/java/org/apache/sqoop/mapreduce/db/DBRecordReader.java @@ -34,8 +34,6 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.sqoop.mapreduce.DBWritable; import org.apache.hadoop.util.ReflectionUtils; -import com.cloudera.sqoop.mapreduce.db.DBConfiguration; -import com.cloudera.sqoop.mapreduce.db.DBInputFormat; import org.apache.sqoop.util.LoggingUtils; /** http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/db/DataDrivenDBInputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/db/DataDrivenDBInputFormat.java b/src/java/org/apache/sqoop/mapreduce/db/DataDrivenDBInputFormat.java index 136b30a..d039632 100644 --- a/src/java/org/apache/sqoop/mapreduce/db/DataDrivenDBInputFormat.java +++ b/src/java/org/apache/sqoop/mapreduce/db/DataDrivenDBInputFormat.java @@ -40,17 +40,8 @@ import org.apache.hadoop.mapreduce.JobContext; import org.apache.hadoop.mapreduce.RecordReader; import org.apache.sqoop.mapreduce.DBWritable; -import com.cloudera.sqoop.config.ConfigurationHelper; -import com.cloudera.sqoop.mapreduce.db.BigDecimalSplitter; -import com.cloudera.sqoop.mapreduce.db.BooleanSplitter; -import com.cloudera.sqoop.mapreduce.db.DBConfiguration; -import com.cloudera.sqoop.mapreduce.db.DBInputFormat; -import com.cloudera.sqoop.mapreduce.db.DBSplitter; -import com.cloudera.sqoop.mapreduce.db.DataDrivenDBRecordReader; -import com.cloudera.sqoop.mapreduce.db.DateSplitter; -import com.cloudera.sqoop.mapreduce.db.FloatSplitter; -import com.cloudera.sqoop.mapreduce.db.IntegerSplitter; -import com.cloudera.sqoop.mapreduce.db.TextSplitter; +import org.apache.sqoop.config.ConfigurationHelper; +import org.apache.sqoop.mapreduce.db.DataDrivenDBRecordReader; import org.apache.sqoop.validation.ValidationException; /** @@ -161,7 +152,7 @@ public class DataDrivenDBInputFormat<T extends DBWritable> && (boundaryQuery == null || boundaryQuery.isEmpty()) && splitLimit <= 0) { List<InputSplit> singletonSplit = new ArrayList<InputSplit>(); - singletonSplit.add(new com.cloudera.sqoop.mapreduce.db. + singletonSplit.add(new org.apache.sqoop.mapreduce.db. DataDrivenDBInputFormat.DataDrivenDBInputSplit("1=1", "1=1")); return singletonSplit; } http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/db/DataDrivenDBRecordReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/db/DataDrivenDBRecordReader.java b/src/java/org/apache/sqoop/mapreduce/db/DataDrivenDBRecordReader.java index b734e05..62434fa 100644 --- a/src/java/org/apache/sqoop/mapreduce/db/DataDrivenDBRecordReader.java +++ b/src/java/org/apache/sqoop/mapreduce/db/DataDrivenDBRecordReader.java @@ -27,11 +27,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.sqoop.mapreduce.DBWritable; -import com.cloudera.sqoop.mapreduce.db.DBConfiguration; -import com.cloudera.sqoop.mapreduce.db.DBInputFormat; -import com.cloudera.sqoop.mapreduce.db.DBRecordReader; -import com.cloudera.sqoop.mapreduce.db.DataDrivenDBInputFormat; - /** * A RecordReader that reads records from a SQL table, * using data-driven WHERE clause splits. http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/db/DateSplitter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/db/DateSplitter.java b/src/java/org/apache/sqoop/mapreduce/db/DateSplitter.java index 9b94283..7e7287f 100644 --- a/src/java/org/apache/sqoop/mapreduce/db/DateSplitter.java +++ b/src/java/org/apache/sqoop/mapreduce/db/DateSplitter.java @@ -29,9 +29,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.InputSplit; -import com.cloudera.sqoop.config.ConfigurationHelper; -import com.cloudera.sqoop.mapreduce.db.DataDrivenDBInputFormat; -import com.cloudera.sqoop.mapreduce.db.IntegerSplitter; +import org.apache.sqoop.config.ConfigurationHelper; /** * Implement DBSplitter over date/time values. http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/db/Db2DBRecordReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/db/Db2DBRecordReader.java b/src/java/org/apache/sqoop/mapreduce/db/Db2DBRecordReader.java index 5a3bcca..5859f0f 100644 --- a/src/java/org/apache/sqoop/mapreduce/db/Db2DBRecordReader.java +++ b/src/java/org/apache/sqoop/mapreduce/db/Db2DBRecordReader.java @@ -25,10 +25,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.sqoop.mapreduce.DBWritable; -import com.cloudera.sqoop.mapreduce.db.DBConfiguration; -import com.cloudera.sqoop.mapreduce.db.DBInputFormat; -import com.cloudera.sqoop.mapreduce.db.DBRecordReader; - /** * A RecordReader that reads records from DB2. */ http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/db/Db2DataDrivenDBInputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/db/Db2DataDrivenDBInputFormat.java b/src/java/org/apache/sqoop/mapreduce/db/Db2DataDrivenDBInputFormat.java index 95b1cbe..d79ff7f 100644 --- a/src/java/org/apache/sqoop/mapreduce/db/Db2DataDrivenDBInputFormat.java +++ b/src/java/org/apache/sqoop/mapreduce/db/Db2DataDrivenDBInputFormat.java @@ -26,9 +26,6 @@ import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.mapreduce.RecordReader; import org.apache.sqoop.mapreduce.DBWritable; -import com.cloudera.sqoop.mapreduce.db.DBConfiguration; -import com.cloudera.sqoop.mapreduce.db.DataDrivenDBInputFormat; - /** * A InputFormat that reads input data from DB2. */ http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/db/Db2DataDrivenDBRecordReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/db/Db2DataDrivenDBRecordReader.java b/src/java/org/apache/sqoop/mapreduce/db/Db2DataDrivenDBRecordReader.java index f9eb79c..7b6e824 100644 --- a/src/java/org/apache/sqoop/mapreduce/db/Db2DataDrivenDBRecordReader.java +++ b/src/java/org/apache/sqoop/mapreduce/db/Db2DataDrivenDBRecordReader.java @@ -23,10 +23,6 @@ import java.sql.SQLException; import org.apache.hadoop.conf.Configuration; import org.apache.sqoop.mapreduce.DBWritable; -import com.cloudera.sqoop.mapreduce.db.DBConfiguration; -import com.cloudera.sqoop.mapreduce.db.DBInputFormat; -import com.cloudera.sqoop.mapreduce.db.DataDrivenDBRecordReader; - /** * A RecordReader that reads records from DB2 via DataDrivenDBRecordReader. */ http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/db/FloatSplitter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/db/FloatSplitter.java b/src/java/org/apache/sqoop/mapreduce/db/FloatSplitter.java index 71a50d2..517d66d 100644 --- a/src/java/org/apache/sqoop/mapreduce/db/FloatSplitter.java +++ b/src/java/org/apache/sqoop/mapreduce/db/FloatSplitter.java @@ -27,9 +27,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.InputSplit; -import com.cloudera.sqoop.config.ConfigurationHelper; -import com.cloudera.sqoop.mapreduce.db.DBSplitter; -import com.cloudera.sqoop.mapreduce.db.DataDrivenDBInputFormat; +import org.apache.sqoop.config.ConfigurationHelper; /** * Implement DBSplitter over floating-point values. http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/db/IntegerSplitter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/db/IntegerSplitter.java b/src/java/org/apache/sqoop/mapreduce/db/IntegerSplitter.java index 5f8f937..22c18e2 100644 --- a/src/java/org/apache/sqoop/mapreduce/db/IntegerSplitter.java +++ b/src/java/org/apache/sqoop/mapreduce/db/IntegerSplitter.java @@ -27,9 +27,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.InputSplit; -import com.cloudera.sqoop.config.ConfigurationHelper; -import com.cloudera.sqoop.mapreduce.db.DBSplitter; -import com.cloudera.sqoop.mapreduce.db.DataDrivenDBInputFormat; +import org.apache.sqoop.config.ConfigurationHelper; /** * Implement DBSplitter over integer values. http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/db/OracleDBRecordReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/db/OracleDBRecordReader.java b/src/java/org/apache/sqoop/mapreduce/db/OracleDBRecordReader.java index 4d7da39..c235362 100644 --- a/src/java/org/apache/sqoop/mapreduce/db/OracleDBRecordReader.java +++ b/src/java/org/apache/sqoop/mapreduce/db/OracleDBRecordReader.java @@ -29,10 +29,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.sqoop.mapreduce.DBWritable; -import com.cloudera.sqoop.mapreduce.db.DBConfiguration; -import com.cloudera.sqoop.mapreduce.db.DBInputFormat; -import com.cloudera.sqoop.mapreduce.db.DBRecordReader; - /** * A RecordReader that reads records from an Oracle SQL table. */ http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/db/OracleDataDrivenDBInputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/db/OracleDataDrivenDBInputFormat.java b/src/java/org/apache/sqoop/mapreduce/db/OracleDataDrivenDBInputFormat.java index 8b5103b..88a5369 100644 --- a/src/java/org/apache/sqoop/mapreduce/db/OracleDataDrivenDBInputFormat.java +++ b/src/java/org/apache/sqoop/mapreduce/db/OracleDataDrivenDBInputFormat.java @@ -27,13 +27,6 @@ import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.mapreduce.RecordReader; import org.apache.sqoop.mapreduce.DBWritable; -import com.cloudera.sqoop.mapreduce.db.DBConfiguration; -import com.cloudera.sqoop.mapreduce.db.DBSplitter; -import com.cloudera.sqoop.mapreduce.db.DataDrivenDBInputFormat; -import com.cloudera.sqoop.mapreduce.db.OracleDataDrivenDBRecordReader; -import com.cloudera.sqoop.mapreduce.db.OracleDateSplitter; -import com.cloudera.sqoop.mapreduce.db.DBInputFormat.DBInputSplit; - /** * A InputFormat that reads input data from an SQL table in an Oracle db. */ http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/db/OracleDataDrivenDBRecordReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/db/OracleDataDrivenDBRecordReader.java b/src/java/org/apache/sqoop/mapreduce/db/OracleDataDrivenDBRecordReader.java index 871b59b..e8ef9e9 100644 --- a/src/java/org/apache/sqoop/mapreduce/db/OracleDataDrivenDBRecordReader.java +++ b/src/java/org/apache/sqoop/mapreduce/db/OracleDataDrivenDBRecordReader.java @@ -23,11 +23,6 @@ import java.sql.SQLException; import org.apache.hadoop.conf.Configuration; import org.apache.sqoop.mapreduce.DBWritable; -import com.cloudera.sqoop.mapreduce.db.DBConfiguration; -import com.cloudera.sqoop.mapreduce.db.DBInputFormat; -import com.cloudera.sqoop.mapreduce.db.DataDrivenDBRecordReader; -import com.cloudera.sqoop.mapreduce.db.OracleDBRecordReader; - /** * A RecordReader that reads records from a Oracle table * via DataDrivenDBRecordReader. http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/db/OracleDateSplitter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/db/OracleDateSplitter.java b/src/java/org/apache/sqoop/mapreduce/db/OracleDateSplitter.java index 5d2e9d3..a82abfb 100644 --- a/src/java/org/apache/sqoop/mapreduce/db/OracleDateSplitter.java +++ b/src/java/org/apache/sqoop/mapreduce/db/OracleDateSplitter.java @@ -19,8 +19,6 @@ package org.apache.sqoop.mapreduce.db; import java.util.Date; -import com.cloudera.sqoop.mapreduce.db.DateSplitter; - /** * Implement DBSplitter over date/time values returned by an Oracle db. * Make use of logic from DateSplitter, since this just needs to use http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/db/SQLServerDBInputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/db/SQLServerDBInputFormat.java b/src/java/org/apache/sqoop/mapreduce/db/SQLServerDBInputFormat.java index c90daeb..09fb52f 100644 --- a/src/java/org/apache/sqoop/mapreduce/db/SQLServerDBInputFormat.java +++ b/src/java/org/apache/sqoop/mapreduce/db/SQLServerDBInputFormat.java @@ -31,8 +31,6 @@ import org.apache.hadoop.mapreduce.RecordReader; import org.apache.sqoop.mapreduce.DBWritable; import org.apache.sqoop.lib.SqoopRecord; -import com.cloudera.sqoop.mapreduce.db.DBConfiguration; - /** * A InputFormat that reads input data from a SQL table. * Operates like DataDrivenDBInputFormat, but attempts to recover from http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/db/SQLServerDBRecordReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/db/SQLServerDBRecordReader.java b/src/java/org/apache/sqoop/mapreduce/db/SQLServerDBRecordReader.java index 1dea842..2c8a9fd 100644 --- a/src/java/org/apache/sqoop/mapreduce/db/SQLServerDBRecordReader.java +++ b/src/java/org/apache/sqoop/mapreduce/db/SQLServerDBRecordReader.java @@ -30,10 +30,6 @@ import org.apache.sqoop.mapreduce.sqlserver.SqlServerRecordReader; import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.mapreduce.TaskAttemptContext; -import com.cloudera.sqoop.mapreduce.db.DBConfiguration; -import com.cloudera.sqoop.mapreduce.db.DBInputFormat; -import com.cloudera.sqoop.mapreduce.db.DataDrivenDBInputFormat; - import org.apache.sqoop.lib.SqoopRecord; /** http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/db/TextSplitter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/db/TextSplitter.java b/src/java/org/apache/sqoop/mapreduce/db/TextSplitter.java index 8c98d14..22bbfe6 100644 --- a/src/java/org/apache/sqoop/mapreduce/db/TextSplitter.java +++ b/src/java/org/apache/sqoop/mapreduce/db/TextSplitter.java @@ -28,9 +28,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.InputSplit; -import com.cloudera.sqoop.config.ConfigurationHelper; -import com.cloudera.sqoop.mapreduce.db.BigDecimalSplitter; -import com.cloudera.sqoop.mapreduce.db.DataDrivenDBInputFormat; +import org.apache.sqoop.config.ConfigurationHelper; import org.apache.sqoop.validation.ValidationException; /** http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/db/netezza/NetezzaDBDataSliceSplitter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/db/netezza/NetezzaDBDataSliceSplitter.java b/src/java/org/apache/sqoop/mapreduce/db/netezza/NetezzaDBDataSliceSplitter.java index 368a349..9857192 100644 --- a/src/java/org/apache/sqoop/mapreduce/db/netezza/NetezzaDBDataSliceSplitter.java +++ b/src/java/org/apache/sqoop/mapreduce/db/netezza/NetezzaDBDataSliceSplitter.java @@ -27,7 +27,7 @@ import org.apache.sqoop.mapreduce.db.DBSplitter; import org.apache.sqoop.mapreduce.db.DataDrivenDBInputFormat.DataDrivenDBInputSplit; -import com.cloudera.sqoop.config.ConfigurationHelper; +import org.apache.sqoop.config.ConfigurationHelper; /** * Netezza specific splitter based on data slice id. http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/db/netezza/NetezzaExternalTableExportMapper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/db/netezza/NetezzaExternalTableExportMapper.java b/src/java/org/apache/sqoop/mapreduce/db/netezza/NetezzaExternalTableExportMapper.java index aa058d1..5bf2188 100644 --- a/src/java/org/apache/sqoop/mapreduce/db/netezza/NetezzaExternalTableExportMapper.java +++ b/src/java/org/apache/sqoop/mapreduce/db/netezza/NetezzaExternalTableExportMapper.java @@ -46,7 +46,7 @@ import org.apache.sqoop.util.FileUploader; import org.apache.sqoop.util.PerfCounters; import org.apache.sqoop.util.TaskId; -import com.cloudera.sqoop.lib.DelimiterSet; +import org.apache.sqoop.lib.DelimiterSet; /** * Netezza export mapper using external tables. http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/db/netezza/NetezzaExternalTableImportMapper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/db/netezza/NetezzaExternalTableImportMapper.java b/src/java/org/apache/sqoop/mapreduce/db/netezza/NetezzaExternalTableImportMapper.java index 0b4b134..306062a 100644 --- a/src/java/org/apache/sqoop/mapreduce/db/netezza/NetezzaExternalTableImportMapper.java +++ b/src/java/org/apache/sqoop/mapreduce/db/netezza/NetezzaExternalTableImportMapper.java @@ -40,13 +40,12 @@ import org.apache.sqoop.config.ConfigurationHelper; import org.apache.sqoop.io.NamedFifo; import org.apache.sqoop.lib.DelimiterSet; import org.apache.sqoop.manager.DirectNetezzaManager; +import org.apache.sqoop.mapreduce.AutoProgressMapper; import org.apache.sqoop.mapreduce.db.DBConfiguration; import org.apache.sqoop.util.FileUploader; import org.apache.sqoop.util.PerfCounters; import org.apache.sqoop.util.TaskId; -import com.cloudera.sqoop.mapreduce.AutoProgressMapper; - /** * Netezza import mapper using external tables. */ http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/hcat/SqoopHCatImportHelper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/hcat/SqoopHCatImportHelper.java b/src/java/org/apache/sqoop/mapreduce/hcat/SqoopHCatImportHelper.java index efaef17..21ff60a 100644 --- a/src/java/org/apache/sqoop/mapreduce/hcat/SqoopHCatImportHelper.java +++ b/src/java/org/apache/sqoop/mapreduce/hcat/SqoopHCatImportHelper.java @@ -52,11 +52,11 @@ import org.apache.hive.hcatalog.mapreduce.StorerInfo; import org.apache.sqoop.lib.SqoopRecord; import org.apache.sqoop.mapreduce.ImportJobBase; -import com.cloudera.sqoop.lib.BlobRef; -import com.cloudera.sqoop.lib.ClobRef; -import com.cloudera.sqoop.lib.DelimiterSet; -import com.cloudera.sqoop.lib.FieldFormatter; -import com.cloudera.sqoop.lib.LargeObjectLoader; +import org.apache.sqoop.lib.BlobRef; +import org.apache.sqoop.lib.ClobRef; +import org.apache.sqoop.lib.DelimiterSet; +import org.apache.sqoop.lib.FieldFormatter; +import org.apache.sqoop.lib.LargeObjectLoader; /** * Helper class for Sqoop HCat Integration import jobs. http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/hcat/SqoopHCatUtilities.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/hcat/SqoopHCatUtilities.java b/src/java/org/apache/sqoop/mapreduce/hcat/SqoopHCatUtilities.java index 2a1de7f..784b5f2 100644 --- a/src/java/org/apache/sqoop/mapreduce/hcat/SqoopHCatUtilities.java +++ b/src/java/org/apache/sqoop/mapreduce/hcat/SqoopHCatUtilities.java @@ -74,9 +74,9 @@ import org.apache.sqoop.util.Executor; import org.apache.sqoop.util.LoggingAsyncSink; import org.apache.sqoop.util.SubprocessSecurityManager; -import com.cloudera.sqoop.SqoopOptions; -import com.cloudera.sqoop.lib.DelimiterSet; -import com.cloudera.sqoop.util.ExitSecurityException; +import org.apache.sqoop.SqoopOptions; +import org.apache.sqoop.lib.DelimiterSet; +import org.apache.sqoop.util.ExitSecurityException; /** * Utility methods for the HCatalog support for Sqoop. http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/mainframe/MainframeImportJob.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/mainframe/MainframeImportJob.java b/src/java/org/apache/sqoop/mapreduce/mainframe/MainframeImportJob.java index f222dc8..7e975c7 100644 --- a/src/java/org/apache/sqoop/mapreduce/mainframe/MainframeImportJob.java +++ b/src/java/org/apache/sqoop/mapreduce/mainframe/MainframeImportJob.java @@ -26,8 +26,8 @@ import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.Mapper; import org.apache.hadoop.mapreduce.lib.output.LazyOutputFormat; -import com.cloudera.sqoop.SqoopOptions; -import com.cloudera.sqoop.manager.ImportJobContext; +import org.apache.sqoop.SqoopOptions; +import org.apache.sqoop.manager.ImportJobContext; import org.apache.sqoop.mapreduce.DataDrivenImportJob; http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/mysql/MySQLUpsertOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/mysql/MySQLUpsertOutputFormat.java b/src/java/org/apache/sqoop/mapreduce/mysql/MySQLUpsertOutputFormat.java index 72fffc4..207c170 100644 --- a/src/java/org/apache/sqoop/mapreduce/mysql/MySQLUpsertOutputFormat.java +++ b/src/java/org/apache/sqoop/mapreduce/mysql/MySQLUpsertOutputFormat.java @@ -17,8 +17,8 @@ */ package org.apache.sqoop.mapreduce.mysql; -import com.cloudera.sqoop.lib.SqoopRecord; -import com.cloudera.sqoop.mapreduce.UpdateOutputFormat; +import org.apache.sqoop.lib.SqoopRecord; +import org.apache.sqoop.mapreduce.UpdateOutputFormat; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.mapreduce.RecordWriter; http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/netezza/NetezzaDataDrivenDBInputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/netezza/NetezzaDataDrivenDBInputFormat.java b/src/java/org/apache/sqoop/mapreduce/netezza/NetezzaDataDrivenDBInputFormat.java index c4e0062..e5c772b 100644 --- a/src/java/org/apache/sqoop/mapreduce/netezza/NetezzaDataDrivenDBInputFormat.java +++ b/src/java/org/apache/sqoop/mapreduce/netezza/NetezzaDataDrivenDBInputFormat.java @@ -30,7 +30,7 @@ import org.apache.sqoop.mapreduce.DBWritable; import org.apache.sqoop.mapreduce.db.DataDrivenDBInputFormat; import org.apache.sqoop.mapreduce.db.netezza.NetezzaDBDataSliceSplitter; -import com.cloudera.sqoop.config.ConfigurationHelper; +import org.apache.sqoop.config.ConfigurationHelper; /** * Netezza specific DB input format. http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/netezza/NetezzaExternalTableExportJob.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/netezza/NetezzaExternalTableExportJob.java b/src/java/org/apache/sqoop/mapreduce/netezza/NetezzaExternalTableExportJob.java index b035d86..11ac95d 100644 --- a/src/java/org/apache/sqoop/mapreduce/netezza/NetezzaExternalTableExportJob.java +++ b/src/java/org/apache/sqoop/mapreduce/netezza/NetezzaExternalTableExportJob.java @@ -38,11 +38,11 @@ import org.apache.sqoop.mapreduce.db.netezza.NetezzaExternalTableTextExportMapper; import org.apache.sqoop.mapreduce.hcat.SqoopHCatUtilities; -import com.cloudera.sqoop.manager.ConnManager; -import com.cloudera.sqoop.manager.ExportJobContext; -import com.cloudera.sqoop.mapreduce.ExportJobBase; -import com.cloudera.sqoop.mapreduce.db.DBConfiguration; -import com.cloudera.sqoop.mapreduce.db.DBOutputFormat; +import org.apache.sqoop.manager.ConnManager; +import org.apache.sqoop.manager.ExportJobContext; +import org.apache.sqoop.mapreduce.ExportJobBase; +import org.apache.sqoop.mapreduce.db.DBConfiguration; +import org.apache.sqoop.mapreduce.db.DBOutputFormat; /** * Class that runs an export job using netezza external tables in the mapper. http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/netezza/NetezzaExternalTableImportJob.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/netezza/NetezzaExternalTableImportJob.java b/src/java/org/apache/sqoop/mapreduce/netezza/NetezzaExternalTableImportJob.java index 58be69d..c983866 100644 --- a/src/java/org/apache/sqoop/mapreduce/netezza/NetezzaExternalTableImportJob.java +++ b/src/java/org/apache/sqoop/mapreduce/netezza/NetezzaExternalTableImportJob.java @@ -39,11 +39,11 @@ import org.apache.sqoop.mapreduce.db.netezza.NetezzaExternalTableTextImportMapper; import org.apache.sqoop.mapreduce.hcat.SqoopHCatUtilities; -import com.cloudera.sqoop.SqoopOptions; -import com.cloudera.sqoop.manager.ConnManager; -import com.cloudera.sqoop.manager.ImportJobContext; -import com.cloudera.sqoop.mapreduce.db.DBConfiguration; -import com.cloudera.sqoop.mapreduce.db.DataDrivenDBInputFormat; +import org.apache.sqoop.SqoopOptions; +import org.apache.sqoop.manager.ConnManager; +import org.apache.sqoop.manager.ImportJobContext; +import org.apache.sqoop.mapreduce.db.DBConfiguration; +import org.apache.sqoop.mapreduce.db.DataDrivenDBInputFormat; /** * Class that runs an import job using netezza external tables in the mapper. http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/netezza/NetezzaExternalTableInputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/netezza/NetezzaExternalTableInputFormat.java b/src/java/org/apache/sqoop/mapreduce/netezza/NetezzaExternalTableInputFormat.java index 631c664..a6605dc 100644 --- a/src/java/org/apache/sqoop/mapreduce/netezza/NetezzaExternalTableInputFormat.java +++ b/src/java/org/apache/sqoop/mapreduce/netezza/NetezzaExternalTableInputFormat.java @@ -31,7 +31,7 @@ import org.apache.hadoop.mapreduce.JobContext; import org.apache.hadoop.mapreduce.RecordReader; import org.apache.hadoop.mapreduce.TaskAttemptContext; -import com.cloudera.sqoop.config.ConfigurationHelper; +import org.apache.sqoop.config.ConfigurationHelper; /** * InputFormat designed to take data-driven splits and use them in the netezza http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/postgresql/PGBulkloadExportJob.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/postgresql/PGBulkloadExportJob.java b/src/java/org/apache/sqoop/mapreduce/postgresql/PGBulkloadExportJob.java index 3a5f277..21df486 100644 --- a/src/java/org/apache/sqoop/mapreduce/postgresql/PGBulkloadExportJob.java +++ b/src/java/org/apache/sqoop/mapreduce/postgresql/PGBulkloadExportJob.java @@ -19,9 +19,9 @@ package org.apache.sqoop.mapreduce.postgresql; import java.io.IOException; -import com.cloudera.sqoop.manager.ExportJobContext; -import com.cloudera.sqoop.util.ExportException; -import com.cloudera.sqoop.SqoopOptions; +import org.apache.sqoop.manager.ExportJobContext; +import org.apache.sqoop.util.ExportException; +import org.apache.sqoop.SqoopOptions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/postgresql/PostgreSQLCopyExportJob.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/postgresql/PostgreSQLCopyExportJob.java b/src/java/org/apache/sqoop/mapreduce/postgresql/PostgreSQLCopyExportJob.java index 483949f..e4b1350 100644 --- a/src/java/org/apache/sqoop/mapreduce/postgresql/PostgreSQLCopyExportJob.java +++ b/src/java/org/apache/sqoop/mapreduce/postgresql/PostgreSQLCopyExportJob.java @@ -18,9 +18,9 @@ package org.apache.sqoop.mapreduce.postgresql; -import com.cloudera.sqoop.SqoopOptions; -import com.cloudera.sqoop.config.ConfigurationHelper; -import com.cloudera.sqoop.manager.ExportJobContext; +import org.apache.sqoop.SqoopOptions; +import org.apache.sqoop.config.ConfigurationHelper; +import org.apache.sqoop.manager.ExportJobContext; import java.io.IOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/postgresql/PostgreSQLCopyExportMapper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/postgresql/PostgreSQLCopyExportMapper.java b/src/java/org/apache/sqoop/mapreduce/postgresql/PostgreSQLCopyExportMapper.java index d10cadb..cf9a3cd 100644 --- a/src/java/org/apache/sqoop/mapreduce/postgresql/PostgreSQLCopyExportMapper.java +++ b/src/java/org/apache/sqoop/mapreduce/postgresql/PostgreSQLCopyExportMapper.java @@ -18,7 +18,7 @@ package org.apache.sqoop.mapreduce.postgresql; -import com.cloudera.sqoop.lib.DelimiterSet; +import org.apache.sqoop.lib.DelimiterSet; import java.io.IOException; import java.sql.Connection; import java.sql.SQLException; http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/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 e583bbb..af15015 100644 --- a/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerExportBatchOutputFormat.java +++ b/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerExportBatchOutputFormat.java @@ -17,7 +17,7 @@ */ package org.apache.sqoop.mapreduce.sqlserver; -import com.cloudera.sqoop.lib.SqoopRecord; +import org.apache.sqoop.lib.SqoopRecord; import org.apache.hadoop.mapreduce.RecordWriter; import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.sqoop.manager.SQLServerManager; http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerInputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerInputFormat.java b/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerInputFormat.java index 9996d1b..398cdc4 100644 --- a/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerInputFormat.java +++ b/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerInputFormat.java @@ -17,8 +17,8 @@ */ package org.apache.sqoop.mapreduce.sqlserver; -import com.cloudera.sqoop.mapreduce.db.DBConfiguration; -import com.cloudera.sqoop.mapreduce.db.DataDrivenDBInputFormat; +import org.apache.sqoop.mapreduce.db.DBConfiguration; +import org.apache.sqoop.mapreduce.db.DataDrivenDBInputFormat; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.mapreduce.RecordReader; http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerRecordReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerRecordReader.java b/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerRecordReader.java index bc101c5..b7a964b 100644 --- a/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerRecordReader.java +++ b/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerRecordReader.java @@ -17,10 +17,10 @@ */ package org.apache.sqoop.mapreduce.sqlserver; -import com.cloudera.sqoop.mapreduce.db.DBConfiguration; -import com.cloudera.sqoop.mapreduce.db.DBInputFormat; -import com.cloudera.sqoop.mapreduce.db.DataDrivenDBInputFormat; -import com.cloudera.sqoop.mapreduce.db.DataDrivenDBRecordReader; +import org.apache.sqoop.mapreduce.db.DBConfiguration; +import org.apache.sqoop.mapreduce.db.DBInputFormat; +import org.apache.sqoop.mapreduce.db.DataDrivenDBInputFormat; +import org.apache.sqoop.mapreduce.db.DataDrivenDBRecordReader; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerUpsertOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerUpsertOutputFormat.java b/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerUpsertOutputFormat.java index 5abb5ea..d082ddb 100644 --- a/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerUpsertOutputFormat.java +++ b/src/java/org/apache/sqoop/mapreduce/sqlserver/SqlServerUpsertOutputFormat.java @@ -28,8 +28,8 @@ import org.apache.hadoop.mapreduce.RecordWriter; import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.sqoop.manager.SQLServerManager; -import com.cloudera.sqoop.lib.SqoopRecord; -import com.cloudera.sqoop.mapreduce.UpdateOutputFormat; +import org.apache.sqoop.lib.SqoopRecord; +import org.apache.sqoop.mapreduce.UpdateOutputFormat; /** * Update an existing table with new value if the table already http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/metastore/GenericJobStorage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/metastore/GenericJobStorage.java b/src/java/org/apache/sqoop/metastore/GenericJobStorage.java index 4117d7a..648e1f6 100644 --- a/src/java/org/apache/sqoop/metastore/GenericJobStorage.java +++ b/src/java/org/apache/sqoop/metastore/GenericJobStorage.java @@ -31,16 +31,14 @@ import java.util.Map; import java.util.Properties; import java.util.Set; -import com.cloudera.sqoop.manager.ConnManager; +import org.apache.sqoop.manager.ConnManager; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; -import com.cloudera.sqoop.SqoopOptions; -import com.cloudera.sqoop.metastore.JobData; -import com.cloudera.sqoop.metastore.JobStorage; -import com.cloudera.sqoop.tool.SqoopTool; +import org.apache.sqoop.SqoopOptions; +import org.apache.sqoop.tool.SqoopTool; import org.apache.sqoop.manager.DefaultManagerFactory; import org.apache.sqoop.manager.JdbcDrivers; http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/metastore/JobData.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/metastore/JobData.java b/src/java/org/apache/sqoop/metastore/JobData.java index f3d5677..2c68e9f 100644 --- a/src/java/org/apache/sqoop/metastore/JobData.java +++ b/src/java/org/apache/sqoop/metastore/JobData.java @@ -18,8 +18,8 @@ package org.apache.sqoop.metastore; -import com.cloudera.sqoop.SqoopOptions; -import com.cloudera.sqoop.tool.SqoopTool; +import org.apache.sqoop.SqoopOptions; +import org.apache.sqoop.tool.SqoopTool; /** * Container for all job data that should be stored to a http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/metastore/JobStorage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/metastore/JobStorage.java b/src/java/org/apache/sqoop/metastore/JobStorage.java index e66ba5c..b7804ab 100644 --- a/src/java/org/apache/sqoop/metastore/JobStorage.java +++ b/src/java/org/apache/sqoop/metastore/JobStorage.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import org.apache.hadoop.conf.Configured; -import com.cloudera.sqoop.metastore.JobData; /** * API that defines how jobs are saved, restored, and manipulated. http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/metastore/JobStorageFactory.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/metastore/JobStorageFactory.java b/src/java/org/apache/sqoop/metastore/JobStorageFactory.java index 2163f2c..13d5201 100644 --- a/src/java/org/apache/sqoop/metastore/JobStorageFactory.java +++ b/src/java/org/apache/sqoop/metastore/JobStorageFactory.java @@ -23,7 +23,6 @@ import java.util.Map; import org.apache.hadoop.conf.Configuration; import org.apache.sqoop.config.ConfigurationHelper; -import com.cloudera.sqoop.metastore.JobStorage; /** * Factory that produces the correct JobStorage system to work with @@ -42,7 +41,7 @@ public class JobStorageFactory { /** The default list of available JobStorage implementations. */ private static final String DEFAULT_AVAILABLE_STORAGES = - "com.cloudera.sqoop.metastore.GenericJobStorage," + "org.apache.sqoop.metastore.GenericJobStorage," + "org.apache.sqoop.metastore.AutoGenericJobStorage"; public JobStorageFactory(Configuration config) { http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/metastore/hsqldb/HsqldbMetaStore.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/metastore/hsqldb/HsqldbMetaStore.java b/src/java/org/apache/sqoop/metastore/hsqldb/HsqldbMetaStore.java index 273cc1d..4a949cb 100644 --- a/src/java/org/apache/sqoop/metastore/hsqldb/HsqldbMetaStore.java +++ b/src/java/org/apache/sqoop/metastore/hsqldb/HsqldbMetaStore.java @@ -32,9 +32,9 @@ import org.apache.hadoop.util.StringUtils; import org.hsqldb.Server; import org.hsqldb.ServerConstants; -import com.cloudera.sqoop.SqoopOptions; +import org.apache.sqoop.SqoopOptions; -import com.cloudera.sqoop.manager.HsqldbManager; +import org.apache.sqoop.manager.HsqldbManager; /** * Container for an HSQLDB-backed metastore. http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java b/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java index 3c31c43..7a2a5f9 100644 --- a/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java +++ b/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java @@ -32,8 +32,8 @@ import org.apache.avro.Schema.Type; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.cloudera.sqoop.SqoopOptions; -import com.cloudera.sqoop.manager.ConnManager; +import org.apache.sqoop.SqoopOptions; +import org.apache.sqoop.manager.ConnManager; import org.apache.sqoop.avro.AvroUtil; import org.apache.sqoop.config.ConfigurationConstants; http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/orm/ClassWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/orm/ClassWriter.java b/src/java/org/apache/sqoop/orm/ClassWriter.java index cdb2364..a4a768a 100644 --- a/src/java/org/apache/sqoop/orm/ClassWriter.java +++ b/src/java/org/apache/sqoop/orm/ClassWriter.java @@ -38,19 +38,19 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.io.BytesWritable; import org.apache.sqoop.mapreduce.ImportJobBase; -import com.cloudera.sqoop.SqoopOptions; -import com.cloudera.sqoop.lib.BigDecimalSerializer; -import com.cloudera.sqoop.lib.BlobRef; -import com.cloudera.sqoop.lib.BooleanParser; -import com.cloudera.sqoop.lib.ClobRef; -import com.cloudera.sqoop.lib.DelimiterSet; -import com.cloudera.sqoop.lib.FieldFormatter; -import com.cloudera.sqoop.lib.JdbcWritableBridge; -import com.cloudera.sqoop.lib.LargeObjectLoader; -import com.cloudera.sqoop.lib.LobSerializer; -import com.cloudera.sqoop.lib.RecordParser; -import com.cloudera.sqoop.lib.SqoopRecord; -import com.cloudera.sqoop.manager.ConnManager; +import org.apache.sqoop.SqoopOptions; +import org.apache.sqoop.lib.BigDecimalSerializer; +import org.apache.sqoop.lib.BlobRef; +import org.apache.sqoop.lib.BooleanParser; +import org.apache.sqoop.lib.ClobRef; +import org.apache.sqoop.lib.DelimiterSet; +import org.apache.sqoop.lib.FieldFormatter; +import org.apache.sqoop.lib.JdbcWritableBridge; +import org.apache.sqoop.lib.LargeObjectLoader; +import org.apache.sqoop.lib.LobSerializer; +import org.apache.sqoop.lib.RecordParser; +import org.apache.sqoop.lib.SqoopRecord; +import org.apache.sqoop.manager.ConnManager; /** * Creates an ORM class to represent a table from a database. http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/orm/CompilationManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/orm/CompilationManager.java b/src/java/org/apache/sqoop/orm/CompilationManager.java index 3322c8b..6590cac 100644 --- a/src/java/org/apache/sqoop/orm/CompilationManager.java +++ b/src/java/org/apache/sqoop/orm/CompilationManager.java @@ -41,9 +41,9 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.util.Shell; -import com.cloudera.sqoop.SqoopOptions; -import com.cloudera.sqoop.util.FileListing; -import com.cloudera.sqoop.util.Jars; +import org.apache.sqoop.SqoopOptions; +import org.apache.sqoop.util.FileListing; +import org.apache.sqoop.util.Jars; import static org.apache.commons.lang3.StringUtils.substringBeforeLast; http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/orm/TableClassName.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/orm/TableClassName.java b/src/java/org/apache/sqoop/orm/TableClassName.java index 13aa301..5cb48a6 100644 --- a/src/java/org/apache/sqoop/orm/TableClassName.java +++ b/src/java/org/apache/sqoop/orm/TableClassName.java @@ -21,7 +21,7 @@ package org.apache.sqoop.orm; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.cloudera.sqoop.SqoopOptions; +import org.apache.sqoop.SqoopOptions; /** * Reconciles the table name being imported with the class naming information http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/tool/BaseSqoopTool.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/tool/BaseSqoopTool.java b/src/java/org/apache/sqoop/tool/BaseSqoopTool.java index b4f972c..ce21918 100644 --- a/src/java/org/apache/sqoop/tool/BaseSqoopTool.java +++ b/src/java/org/apache/sqoop/tool/BaseSqoopTool.java @@ -33,20 +33,21 @@ import org.apache.commons.cli.OptionGroup; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.util.StringUtils; +import org.apache.sqoop.manager.SupportedManagers; import org.apache.sqoop.mapreduce.hcat.SqoopHCatUtilities; import org.apache.sqoop.util.CredentialsUtil; import org.apache.sqoop.util.LoggingUtils; import org.apache.sqoop.util.password.CredentialProviderHelper; -import com.cloudera.sqoop.ConnFactory; -import com.cloudera.sqoop.SqoopOptions; -import com.cloudera.sqoop.SqoopOptions.IncrementalMode; -import com.cloudera.sqoop.SqoopOptions.InvalidOptionsException; -import com.cloudera.sqoop.cli.RelatedOptions; -import com.cloudera.sqoop.cli.ToolOptions; -import com.cloudera.sqoop.lib.DelimiterSet; -import com.cloudera.sqoop.manager.ConnManager; -import com.cloudera.sqoop.metastore.JobData; +import org.apache.sqoop.ConnFactory; +import org.apache.sqoop.SqoopOptions; +import org.apache.sqoop.SqoopOptions.IncrementalMode; +import org.apache.sqoop.SqoopOptions.InvalidOptionsException; +import org.apache.sqoop.cli.RelatedOptions; +import org.apache.sqoop.cli.ToolOptions; +import org.apache.sqoop.lib.DelimiterSet; +import org.apache.sqoop.manager.ConnManager; +import org.apache.sqoop.metastore.JobData; /** * Layer on top of SqoopTool that provides some basic common code @@ -55,7 +56,7 @@ import com.cloudera.sqoop.metastore.JobData; * Subclasses should call init() at the top of their run() method, * and call destroy() at the end in a finally block. */ -public abstract class BaseSqoopTool extends com.cloudera.sqoop.tool.SqoopTool { +public abstract class BaseSqoopTool extends org.apache.sqoop.tool.SqoopTool { public static final String METADATA_TRANSACTION_ISOLATION_LEVEL = "metadata-transaction-isolation-level"; @@ -1823,5 +1824,13 @@ public abstract class BaseSqoopTool extends com.cloudera.sqoop.tool.SqoopTool { return dashPos; } + + protected void validateHasDirectConnectorOption(SqoopOptions options) throws SqoopOptions.InvalidOptionsException { + SupportedManagers m = SupportedManagers.createFrom(options); + if (m != null && options.isDirect() && !m.hasDirectConnector()) { + throw new SqoopOptions.InvalidOptionsException( + "Was called with the --direct option, but no direct connector available."); + } + } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/tool/CodeGenTool.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/tool/CodeGenTool.java b/src/java/org/apache/sqoop/tool/CodeGenTool.java index 443cbf1..f0a8971 100644 --- a/src/java/org/apache/sqoop/tool/CodeGenTool.java +++ b/src/java/org/apache/sqoop/tool/CodeGenTool.java @@ -28,18 +28,18 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.util.StringUtils; -import com.cloudera.sqoop.SqoopOptions; -import com.cloudera.sqoop.SqoopOptions.InvalidOptionsException; -import com.cloudera.sqoop.cli.RelatedOptions; -import com.cloudera.sqoop.cli.ToolOptions; -import com.cloudera.sqoop.hive.HiveImport; -import com.cloudera.sqoop.orm.ClassWriter; -import com.cloudera.sqoop.orm.CompilationManager; +import org.apache.sqoop.SqoopOptions; +import org.apache.sqoop.SqoopOptions.InvalidOptionsException; +import org.apache.sqoop.cli.RelatedOptions; +import org.apache.sqoop.cli.ToolOptions; +import org.apache.sqoop.hive.HiveImport; +import org.apache.sqoop.orm.ClassWriter; +import org.apache.sqoop.orm.CompilationManager; /** * Tool that generates code from a database schema. */ -public class CodeGenTool extends com.cloudera.sqoop.tool.BaseSqoopTool { +public class CodeGenTool extends BaseSqoopTool { public static final Log LOG = LogFactory.getLog(CodeGenTool.class.getName()); http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/tool/CreateHiveTableTool.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/tool/CreateHiveTableTool.java b/src/java/org/apache/sqoop/tool/CreateHiveTableTool.java index ec35491..d259566 100644 --- a/src/java/org/apache/sqoop/tool/CreateHiveTableTool.java +++ b/src/java/org/apache/sqoop/tool/CreateHiveTableTool.java @@ -26,16 +26,16 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.util.StringUtils; -import com.cloudera.sqoop.SqoopOptions; -import com.cloudera.sqoop.SqoopOptions.InvalidOptionsException; -import com.cloudera.sqoop.cli.RelatedOptions; -import com.cloudera.sqoop.cli.ToolOptions; -import com.cloudera.sqoop.hive.HiveImport; +import org.apache.sqoop.SqoopOptions; +import org.apache.sqoop.SqoopOptions.InvalidOptionsException; +import org.apache.sqoop.cli.RelatedOptions; +import org.apache.sqoop.cli.ToolOptions; +import org.apache.sqoop.hive.HiveImport; /** * Tool that creates a Hive table definition. */ -public class CreateHiveTableTool extends com.cloudera.sqoop.tool.BaseSqoopTool { +public class CreateHiveTableTool extends BaseSqoopTool { public static final Log LOG = LogFactory.getLog( CreateHiveTableTool.class.getName()); http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/tool/EvalSqlTool.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/tool/EvalSqlTool.java b/src/java/org/apache/sqoop/tool/EvalSqlTool.java index 413aa3d..7c204c4 100644 --- a/src/java/org/apache/sqoop/tool/EvalSqlTool.java +++ b/src/java/org/apache/sqoop/tool/EvalSqlTool.java @@ -33,16 +33,16 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.util.StringUtils; -import com.cloudera.sqoop.SqoopOptions; -import com.cloudera.sqoop.SqoopOptions.InvalidOptionsException; -import com.cloudera.sqoop.cli.RelatedOptions; -import com.cloudera.sqoop.cli.ToolOptions; -import com.cloudera.sqoop.util.ResultSetPrinter; +import org.apache.sqoop.SqoopOptions; +import org.apache.sqoop.SqoopOptions.InvalidOptionsException; +import org.apache.sqoop.cli.RelatedOptions; +import org.apache.sqoop.cli.ToolOptions; +import org.apache.sqoop.util.ResultSetPrinter; /** * Tool that evaluates a SQL statement and displays the results. */ -public class EvalSqlTool extends com.cloudera.sqoop.tool.BaseSqoopTool { +public class EvalSqlTool extends BaseSqoopTool { public static final Log LOG = LogFactory.getLog(EvalSqlTool.class.getName()); http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/tool/ExportTool.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/tool/ExportTool.java b/src/java/org/apache/sqoop/tool/ExportTool.java index 4bd2fed..060f2c0 100644 --- a/src/java/org/apache/sqoop/tool/ExportTool.java +++ b/src/java/org/apache/sqoop/tool/ExportTool.java @@ -28,19 +28,19 @@ import org.apache.commons.cli.OptionBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.cloudera.sqoop.SqoopOptions; -import com.cloudera.sqoop.SqoopOptions.InvalidOptionsException; -import com.cloudera.sqoop.SqoopOptions.UpdateMode; -import com.cloudera.sqoop.cli.RelatedOptions; -import com.cloudera.sqoop.cli.ToolOptions; -import com.cloudera.sqoop.manager.ExportJobContext; -import com.cloudera.sqoop.util.ExportException; +import org.apache.sqoop.SqoopOptions; +import org.apache.sqoop.SqoopOptions.InvalidOptionsException; +import org.apache.sqoop.SqoopOptions.UpdateMode; +import org.apache.sqoop.cli.RelatedOptions; +import org.apache.sqoop.cli.ToolOptions; +import org.apache.sqoop.manager.ExportJobContext; +import org.apache.sqoop.util.ExportException; import static org.apache.sqoop.manager.SupportedManagers.MYSQL; /** * Tool that performs HDFS exports to databases. */ -public class ExportTool extends com.cloudera.sqoop.tool.BaseSqoopTool { +public class ExportTool extends BaseSqoopTool { public static final Log LOG = LogFactory.getLog(ExportTool.class.getName()); public static final String NOT_SUPPORTED_FILE_FORMAT_ERROR_MSG = "Please note that the export tool " + http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/tool/HelpTool.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/tool/HelpTool.java b/src/java/org/apache/sqoop/tool/HelpTool.java index bc1d7e9..fc8dbde 100644 --- a/src/java/org/apache/sqoop/tool/HelpTool.java +++ b/src/java/org/apache/sqoop/tool/HelpTool.java @@ -20,13 +20,13 @@ package org.apache.sqoop.tool; import java.util.Set; -import com.cloudera.sqoop.SqoopOptions; -import com.cloudera.sqoop.cli.ToolOptions; +import org.apache.sqoop.SqoopOptions; +import org.apache.sqoop.cli.ToolOptions; /** * Tool that explains the usage of Sqoop. */ -public class HelpTool extends com.cloudera.sqoop.tool.BaseSqoopTool { +public class HelpTool extends BaseSqoopTool { public HelpTool() { super("help"); http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/org/apache/sqoop/tool/ImportAllTablesTool.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/tool/ImportAllTablesTool.java b/src/java/org/apache/sqoop/tool/ImportAllTablesTool.java index efe4e32..18f7a0a 100644 --- a/src/java/org/apache/sqoop/tool/ImportAllTablesTool.java +++ b/src/java/org/apache/sqoop/tool/ImportAllTablesTool.java @@ -28,16 +28,16 @@ import org.apache.commons.cli.OptionBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.cloudera.sqoop.SqoopOptions; -import com.cloudera.sqoop.SqoopOptions.InvalidOptionsException; -import com.cloudera.sqoop.cli.RelatedOptions; -import com.cloudera.sqoop.hive.HiveImport; -import com.cloudera.sqoop.util.ImportException; +import org.apache.sqoop.SqoopOptions; +import org.apache.sqoop.SqoopOptions.InvalidOptionsException; +import org.apache.sqoop.cli.RelatedOptions; +import org.apache.sqoop.hive.HiveImport; +import org.apache.sqoop.util.ImportException; /** * Tool that performs database imports of all tables in a database to HDFS. */ -public class ImportAllTablesTool extends com.cloudera.sqoop.tool.ImportTool { +public class ImportAllTablesTool extends ImportTool { public static final Log LOG = LogFactory.getLog( ImportAllTablesTool.class.getName());
