SQOOP-3273: Removing com.cloudera.sqoop packages (Szabolcs Vasas via Anna Szonyi)
Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/6984a36c Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/6984a36c Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/6984a36c Branch: refs/heads/trunk Commit: 6984a36c597fd77a635a08da1e3ced4f63e5b735 Parents: bf8b8a6 Author: Anna Szonyi <[email protected]> Authored: Thu Jan 18 15:01:54 2018 +0100 Committer: Anna Szonyi <[email protected]> Committed: Thu Jan 18 15:01:54 2018 +0100 ---------------------------------------------------------------------- build.xml | 9 +- conf/sqoop-site-template.xml | 2 +- ivy.xml | 2 +- src/docs/dev/api-reference.txt | 28 +- src/docs/sip/sip-4.txt | 2 +- src/java/com/cloudera/sqoop/ConnFactory.java | 40 - src/java/com/cloudera/sqoop/Sqoop.java | 70 - src/java/com/cloudera/sqoop/SqoopOptions.java | 121 -- .../com/cloudera/sqoop/cli/RelatedOptions.java | 34 - .../com/cloudera/sqoop/cli/SqoopParser.java | 26 - .../com/cloudera/sqoop/cli/ToolOptions.java | 27 - .../sqoop/config/ConfigurationConstants.java | 51 - .../sqoop/config/ConfigurationHelper.java | 112 -- .../cloudera/sqoop/hbase/HBasePutProcessor.java | 36 - .../com/cloudera/sqoop/hbase/HBaseUtil.java | 39 - .../cloudera/sqoop/hbase/PutTransformer.java | 26 - .../sqoop/hbase/ToStringPutTransformer.java | 26 - .../com/cloudera/sqoop/hive/HiveImport.java | 37 - src/java/com/cloudera/sqoop/hive/HiveTypes.java | 36 - .../com/cloudera/sqoop/hive/TableDefWriter.java | 43 - src/java/com/cloudera/sqoop/io/CodecMap.java | 84 -- .../sqoop/io/FixedLengthInputStream.java | 38 - src/java/com/cloudera/sqoop/io/LobFile.java | 131 -- .../com/cloudera/sqoop/io/LobReaderCache.java | 65 - src/java/com/cloudera/sqoop/io/NamedFifo.java | 38 - .../sqoop/io/SplittableBufferedWriter.java | 41 - .../sqoop/io/SplittingOutputStream.java | 45 - .../sqoop/io/UnsupportedCodecException.java | 41 - .../sqoop/lib/BigDecimalSerializer.java | 61 - src/java/com/cloudera/sqoop/lib/BlobRef.java | 65 - .../com/cloudera/sqoop/lib/BooleanParser.java | 43 - src/java/com/cloudera/sqoop/lib/ClobRef.java | 57 - .../com/cloudera/sqoop/lib/DelimiterSet.java | 79 - .../com/cloudera/sqoop/lib/FieldFormatter.java | 80 -- .../cloudera/sqoop/lib/FieldMapProcessor.java | 29 - .../com/cloudera/sqoop/lib/FieldMappable.java | 30 - .../cloudera/sqoop/lib/JdbcWritableBridge.java | 187 --- .../cloudera/sqoop/lib/LargeObjectLoader.java | 55 - src/java/com/cloudera/sqoop/lib/LobRef.java | 54 - .../com/cloudera/sqoop/lib/LobSerializer.java | 51 - .../cloudera/sqoop/lib/ProcessingException.java | 45 - .../com/cloudera/sqoop/lib/RecordParser.java | 82 -- .../com/cloudera/sqoop/lib/SqoopRecord.java | 32 - .../sqoop/manager/CatalogQueryManager.java | 34 - .../com/cloudera/sqoop/manager/ConnManager.java | 26 - .../com/cloudera/sqoop/manager/Db2Manager.java | 32 - .../sqoop/manager/DefaultManagerFactory.java | 27 - .../sqoop/manager/DirectMySQLManager.java | 34 - .../sqoop/manager/DirectPostgresqlManager.java | 32 - .../sqoop/manager/ExportJobContext.java | 42 - .../sqoop/manager/GenericJdbcManager.java | 34 - .../cloudera/sqoop/manager/HsqldbManager.java | 33 - .../sqoop/manager/ImportJobContext.java | 44 - .../sqoop/manager/InformationSchemaManager.java | 34 - .../cloudera/sqoop/manager/ManagerFactory.java | 27 - .../cloudera/sqoop/manager/MySQLManager.java | 34 - .../com/cloudera/sqoop/manager/MySQLUtils.java | 69 - .../cloudera/sqoop/manager/OracleManager.java | 47 - .../sqoop/manager/PostgresqlManager.java | 33 - .../sqoop/manager/SQLServerManager.java | 33 - .../com/cloudera/sqoop/manager/SqlManager.java | 36 - .../sqoop/mapreduce/AsyncSqlOutputFormat.java | 82 -- .../sqoop/mapreduce/AsyncSqlRecordWriter.java | 36 - .../sqoop/mapreduce/AutoProgressMapper.java | 42 - .../sqoop/mapreduce/AvroExportMapper.java | 30 - .../sqoop/mapreduce/AvroImportMapper.java | 26 - .../sqoop/mapreduce/AvroInputFormat.java | 27 - .../com/cloudera/sqoop/mapreduce/AvroJob.java | 42 - .../sqoop/mapreduce/AvroOutputFormat.java | 26 - .../sqoop/mapreduce/AvroRecordReader.java | 27 - .../mapreduce/CombineShimRecordReader.java | 37 - .../sqoop/mapreduce/DataDrivenImportJob.java | 42 - .../sqoop/mapreduce/DelegatingOutputFormat.java | 32 - .../mapreduce/ExportBatchOutputFormat.java | 29 - .../sqoop/mapreduce/ExportInputFormat.java | 40 - .../cloudera/sqoop/mapreduce/ExportJobBase.java | 65 - .../sqoop/mapreduce/ExportOutputFormat.java | 41 - .../sqoop/mapreduce/HBaseImportJob.java | 41 - .../sqoop/mapreduce/HBaseImportMapper.java | 27 - .../cloudera/sqoop/mapreduce/ImportJobBase.java | 49 - .../cloudera/sqoop/mapreduce/JdbcExportJob.java | 44 - .../sqoop/mapreduce/JdbcUpdateExportJob.java | 46 - .../sqoop/mapreduce/JdbcUpsertExportJob.java | 38 - .../com/cloudera/sqoop/mapreduce/JobBase.java | 96 -- .../com/cloudera/sqoop/mapreduce/MergeJob.java | 44 - .../sqoop/mapreduce/MergeMapperBase.java | 26 - .../cloudera/sqoop/mapreduce/MergeRecord.java | 37 - .../sqoop/mapreduce/MergeRecordMapper.java | 26 - .../cloudera/sqoop/mapreduce/MergeReducer.java | 27 - .../sqoop/mapreduce/MergeTextMapper.java | 26 - .../sqoop/mapreduce/MySQLDumpImportJob.java | 35 - .../sqoop/mapreduce/MySQLDumpInputFormat.java | 27 - .../sqoop/mapreduce/MySQLDumpMapper.java | 57 - .../sqoop/mapreduce/MySQLExportJob.java | 33 - .../sqoop/mapreduce/MySQLExportMapper.java | 33 - .../mapreduce/MySQLRecordExportMapper.java | 26 - .../sqoop/mapreduce/MySQLTextExportMapper.java | 26 - .../sqoop/mapreduce/NullOutputCommitter.java | 27 - .../mapreduce/OracleExportOutputFormat.java | 28 - .../mapreduce/OracleUpsertOutputFormat.java | 28 - .../sqoop/mapreduce/RawKeyTextOutputFormat.java | 43 - .../mapreduce/SQLServerExportOutputFormat.java | 28 - .../mapreduce/SequenceFileExportMapper.java | 26 - .../mapreduce/SequenceFileImportMapper.java | 27 - .../sqoop/mapreduce/TextExportMapper.java | 26 - .../sqoop/mapreduce/TextImportMapper.java | 27 - .../sqoop/mapreduce/UpdateOutputFormat.java | 28 - .../sqoop/mapreduce/db/BigDecimalSplitter.java | 30 - .../sqoop/mapreduce/db/BooleanSplitter.java | 30 - .../sqoop/mapreduce/db/DBConfiguration.java | 165 --- .../sqoop/mapreduce/db/DBInputFormat.java | 73 - .../sqoop/mapreduce/db/DBOutputFormat.java | 58 - .../sqoop/mapreduce/db/DBRecordReader.java | 50 - .../cloudera/sqoop/mapreduce/db/DBSplitter.java | 34 - .../mapreduce/db/DataDrivenDBInputFormat.java | 113 -- .../mapreduce/db/DataDrivenDBRecordReader.java | 53 - .../sqoop/mapreduce/db/DateSplitter.java | 31 - .../sqoop/mapreduce/db/FloatSplitter.java | 30 - .../sqoop/mapreduce/db/IntegerSplitter.java | 32 - .../mapreduce/db/OracleDBRecordReader.java | 58 - .../db/OracleDataDrivenDBInputFormat.java | 31 - .../db/OracleDataDrivenDBRecordReader.java | 47 - .../sqoop/mapreduce/db/OracleDateSplitter.java | 32 - .../sqoop/mapreduce/db/TextSplitter.java | 29 - .../sqoop/metastore/GenericJobStorage.java | 36 - .../com/cloudera/sqoop/metastore/JobData.java | 39 - .../cloudera/sqoop/metastore/JobStorage.java | 27 - .../sqoop/metastore/JobStorageFactory.java | 37 - .../sqoop/metastore/hsqldb/HsqldbMetaStore.java | 42 - .../cloudera/sqoop/orm/AvroSchemaGenerator.java | 34 - .../com/cloudera/sqoop/orm/ClassWriter.java | 111 -- .../cloudera/sqoop/orm/CompilationManager.java | 35 - .../com/cloudera/sqoop/orm/TableClassName.java | 32 - .../com/cloudera/sqoop/tool/BaseSqoopTool.java | 218 --- .../com/cloudera/sqoop/tool/CodeGenTool.java | 25 - .../sqoop/tool/CreateHiveTableTool.java | 25 - .../com/cloudera/sqoop/tool/EvalSqlTool.java | 25 - .../com/cloudera/sqoop/tool/ExportTool.java | 25 - src/java/com/cloudera/sqoop/tool/HelpTool.java | 25 - .../sqoop/tool/ImportAllTablesTool.java | 25 - .../com/cloudera/sqoop/tool/ImportTool.java | 34 - src/java/com/cloudera/sqoop/tool/JobTool.java | 25 - .../cloudera/sqoop/tool/ListDatabasesTool.java | 25 - .../com/cloudera/sqoop/tool/ListTablesTool.java | 25 - src/java/com/cloudera/sqoop/tool/MergeTool.java | 25 - .../com/cloudera/sqoop/tool/MetastoreTool.java | 25 - src/java/com/cloudera/sqoop/tool/SqoopTool.java | 51 - src/java/com/cloudera/sqoop/tool/ToolDesc.java | 30 - .../com/cloudera/sqoop/tool/ToolPlugin.java | 25 - .../com/cloudera/sqoop/tool/VersionTool.java | 25 - .../com/cloudera/sqoop/util/AppendUtils.java | 33 - src/java/com/cloudera/sqoop/util/AsyncSink.java | 26 - .../cloudera/sqoop/util/ClassLoaderStack.java | 40 - .../cloudera/sqoop/util/DirectImportUtils.java | 52 - .../cloudera/sqoop/util/ErrorableAsyncSink.java | 26 - .../cloudera/sqoop/util/ErrorableThread.java | 27 - src/java/com/cloudera/sqoop/util/Executor.java | 51 - .../sqoop/util/ExitSecurityException.java | 40 - .../cloudera/sqoop/util/ExportException.java | 44 - .../com/cloudera/sqoop/util/FileListing.java | 47 - .../cloudera/sqoop/util/ImportException.java | 44 - src/java/com/cloudera/sqoop/util/Jars.java | 43 - src/java/com/cloudera/sqoop/util/JdbcUrl.java | 40 - .../cloudera/sqoop/util/LoggingAsyncSink.java | 34 - .../com/cloudera/sqoop/util/LoggingUtils.java | 36 - .../com/cloudera/sqoop/util/NullAsyncSink.java | 26 - .../cloudera/sqoop/util/OptionsFileUtil.java | 36 - .../com/cloudera/sqoop/util/PerfCounters.java | 31 - .../com/cloudera/sqoop/util/RandomHash.java | 37 - .../cloudera/sqoop/util/ResultSetPrinter.java | 27 - .../cloudera/sqoop/util/StoredAsProperty.java | 36 - .../sqoop/util/SubprocessSecurityManager.java | 32 - src/java/com/cloudera/sqoop/util/TaskId.java | 41 - src/java/org/apache/sqoop/ConnFactory.java | 17 +- src/java/org/apache/sqoop/Sqoop.java | 12 +- src/java/org/apache/sqoop/SqoopOptions.java | 57 +- .../accumulo/AccumuloMutationProcessor.java | 6 +- src/java/org/apache/sqoop/avro/AvroUtil.java | 2 +- src/java/org/apache/sqoop/cli/ToolOptions.java | 2 - .../sqoop/config/ConfigurationHelper.java | 2 +- .../apache/sqoop/hbase/HBasePutProcessor.java | 6 +- .../sqoop/hbase/ToStringPutTransformer.java | 1 - src/java/org/apache/sqoop/hive/HiveImport.java | 6 +- .../org/apache/sqoop/hive/TableDefWriter.java | 4 +- src/java/org/apache/sqoop/io/CodecMap.java | 18 +- src/java/org/apache/sqoop/io/LobFile.java | 17 +- .../org/apache/sqoop/io/LobReaderCache.java | 26 +- src/java/org/apache/sqoop/lib/BlobRef.java | 10 +- src/java/org/apache/sqoop/lib/ClobRef.java | 10 +- src/java/org/apache/sqoop/lib/DelimiterSet.java | 15 + .../org/apache/sqoop/lib/FieldFormatter.java | 14 +- .../org/apache/sqoop/lib/FieldMapProcessor.java | 3 - .../apache/sqoop/lib/JdbcWritableBridge.java | 7 +- .../org/apache/sqoop/lib/LargeObjectLoader.java | 16 +- src/java/org/apache/sqoop/lib/LobRef.java | 4 +- .../org/apache/sqoop/lib/LobSerializer.java | 12 +- src/java/org/apache/sqoop/lib/RecordParser.java | 36 +- src/java/org/apache/sqoop/lib/SqoopRecord.java | 28 +- .../sqoop/manager/CatalogQueryManager.java | 4 +- .../org/apache/sqoop/manager/ConnManager.java | 26 +- .../org/apache/sqoop/manager/CubridManager.java | 20 +- .../org/apache/sqoop/manager/Db2Manager.java | 16 +- .../sqoop/manager/DefaultManagerFactory.java | 7 +- .../sqoop/manager/DirectMySQLManager.java | 18 +- .../sqoop/manager/DirectNetezzaManager.java | 12 +- .../sqoop/manager/DirectPostgresqlManager.java | 30 +- .../apache/sqoop/manager/ExportJobContext.java | 2 +- .../sqoop/manager/GenericJdbcManager.java | 4 +- .../org/apache/sqoop/manager/HsqldbManager.java | 10 +- .../apache/sqoop/manager/ImportJobContext.java | 4 +- .../sqoop/manager/InformationSchemaManager.java | 4 +- .../apache/sqoop/manager/MainframeManager.java | 8 +- .../apache/sqoop/manager/ManagerFactory.java | 5 +- .../org/apache/sqoop/manager/MySQLManager.java | 14 +- .../org/apache/sqoop/manager/MySQLUtils.java | 8 +- .../apache/sqoop/manager/NetezzaManager.java | 16 +- .../org/apache/sqoop/manager/OracleManager.java | 26 +- .../apache/sqoop/manager/PGBulkloadManager.java | 5 +- .../apache/sqoop/manager/PostgresqlManager.java | 8 +- .../apache/sqoop/manager/SQLServerManager.java | 28 +- .../org/apache/sqoop/manager/SqlManager.java | 36 +- .../apache/sqoop/manager/SupportedManagers.java | 2 +- .../sqoop/manager/oracle/OraOopConnManager.java | 16 +- .../manager/oracle/OraOopDBInputSplit.java | 2 +- .../manager/oracle/OraOopDBRecordReader.java | 10 +- .../oracle/OraOopDataDrivenDBInputFormat.java | 6 +- .../manager/oracle/OraOopManagerFactory.java | 10 +- .../manager/oracle/OraOopOutputFormatBase.java | 10 +- .../oracle/OraOopOutputFormatInsert.java | 2 +- .../oracle/OraOopOutputFormatUpdate.java | 2 +- .../sqoop/manager/oracle/OraOopUtilities.java | 6 +- .../sqoop/mapreduce/AccumuloImportJob.java | 13 +- .../sqoop/mapreduce/AccumuloImportMapper.java | 3 +- .../sqoop/mapreduce/AsyncSqlOutputFormat.java | 2 +- .../sqoop/mapreduce/AsyncSqlRecordWriter.java | 4 +- .../sqoop/mapreduce/AvroImportMapper.java | 5 +- .../sqoop/mapreduce/DataDrivenImportJob.java | 18 +- .../sqoop/mapreduce/DelegatingOutputFormat.java | 6 +- .../mapreduce/ExportBatchOutputFormat.java | 5 +- .../sqoop/mapreduce/ExportCallOutputFormat.java | 2 +- .../apache/sqoop/mapreduce/ExportJobBase.java | 15 +- .../sqoop/mapreduce/ExportOutputFormat.java | 5 +- .../mapreduce/GenericRecordExportMapper.java | 5 +- .../sqoop/mapreduce/HBaseBulkImportJob.java | 6 +- .../sqoop/mapreduce/HBaseBulkImportMapper.java | 5 +- .../apache/sqoop/mapreduce/HBaseImportJob.java | 15 +- .../sqoop/mapreduce/HBaseImportMapper.java | 3 +- .../apache/sqoop/mapreduce/ImportJobBase.java | 13 +- .../sqoop/mapreduce/JdbcCallExportJob.java | 4 +- .../apache/sqoop/mapreduce/JdbcExportJob.java | 9 +- .../sqoop/mapreduce/JdbcUpdateExportJob.java | 9 +- .../sqoop/mapreduce/JdbcUpsertExportJob.java | 9 +- .../org/apache/sqoop/mapreduce/JobBase.java | 51 +- .../apache/sqoop/mapreduce/MergeAvroMapper.java | 2 +- .../sqoop/mapreduce/MergeAvroReducer.java | 2 +- .../MergeGenericRecordExportMapper.java | 2 +- .../org/apache/sqoop/mapreduce/MergeJob.java | 4 +- .../apache/sqoop/mapreduce/MergeMapperBase.java | 2 +- .../sqoop/mapreduce/MergeParquetMapper.java | 2 +- .../sqoop/mapreduce/MergeParquetReducer.java | 2 +- .../org/apache/sqoop/mapreduce/MergeRecord.java | 2 +- .../sqoop/mapreduce/MergeRecordMapper.java | 3 +- .../apache/sqoop/mapreduce/MergeReducer.java | 2 +- .../sqoop/mapreduce/MergeReducerBase.java | 2 +- .../apache/sqoop/mapreduce/MergeTextMapper.java | 5 +- .../sqoop/mapreduce/MySQLDumpImportJob.java | 12 +- .../sqoop/mapreduce/MySQLDumpInputFormat.java | 2 +- .../apache/sqoop/mapreduce/MySQLDumpMapper.java | 14 +- .../apache/sqoop/mapreduce/MySQLExportJob.java | 11 +- .../sqoop/mapreduce/MySQLExportMapper.java | 6 +- .../mapreduce/MySQLRecordExportMapper.java | 3 +- .../sqoop/mapreduce/MySQLTextExportMapper.java | 3 +- .../mapreduce/OracleExportOutputFormat.java | 5 +- .../mapreduce/OracleUpsertOutputFormat.java | 3 +- .../sqoop/mapreduce/ParquetImportMapper.java | 5 +- .../mapreduce/SQLServerExportOutputFormat.java | 5 +- .../mapreduce/SequenceFileExportMapper.java | 3 +- .../mapreduce/SequenceFileImportMapper.java | 5 +- .../sqoop/mapreduce/TextExportMapper.java | 3 +- .../sqoop/mapreduce/TextImportMapper.java | 5 +- .../sqoop/mapreduce/UpdateOutputFormat.java | 5 +- .../cubrid/CubridUpsertOutputFormat.java | 4 +- .../sqoop/mapreduce/db/BigDecimalSplitter.java | 4 +- .../sqoop/mapreduce/db/BooleanSplitter.java | 3 - .../sqoop/mapreduce/db/DBConfiguration.java | 4 +- .../sqoop/mapreduce/db/DBInputFormat.java | 9 +- .../sqoop/mapreduce/db/DBOutputFormat.java | 5 +- .../sqoop/mapreduce/db/DBRecordReader.java | 2 - .../mapreduce/db/DataDrivenDBInputFormat.java | 15 +- .../mapreduce/db/DataDrivenDBRecordReader.java | 5 - .../apache/sqoop/mapreduce/db/DateSplitter.java | 4 +- .../sqoop/mapreduce/db/Db2DBRecordReader.java | 4 - .../db/Db2DataDrivenDBInputFormat.java | 3 - .../db/Db2DataDrivenDBRecordReader.java | 4 - .../sqoop/mapreduce/db/FloatSplitter.java | 4 +- .../sqoop/mapreduce/db/IntegerSplitter.java | 4 +- .../mapreduce/db/OracleDBRecordReader.java | 4 - .../db/OracleDataDrivenDBInputFormat.java | 7 - .../db/OracleDataDrivenDBRecordReader.java | 5 - .../sqoop/mapreduce/db/OracleDateSplitter.java | 2 - .../mapreduce/db/SQLServerDBInputFormat.java | 2 - .../mapreduce/db/SQLServerDBRecordReader.java | 4 - .../apache/sqoop/mapreduce/db/TextSplitter.java | 4 +- .../db/netezza/NetezzaDBDataSliceSplitter.java | 2 +- .../NetezzaExternalTableExportMapper.java | 2 +- .../NetezzaExternalTableImportMapper.java | 3 +- .../mapreduce/hcat/SqoopHCatImportHelper.java | 10 +- .../mapreduce/hcat/SqoopHCatUtilities.java | 6 +- .../mapreduce/mainframe/MainframeImportJob.java | 4 +- .../mysql/MySQLUpsertOutputFormat.java | 4 +- .../netezza/NetezzaDataDrivenDBInputFormat.java | 2 +- .../netezza/NetezzaExternalTableExportJob.java | 10 +- .../netezza/NetezzaExternalTableImportJob.java | 10 +- .../NetezzaExternalTableInputFormat.java | 2 +- .../postgresql/PGBulkloadExportJob.java | 6 +- .../postgresql/PostgreSQLCopyExportJob.java | 6 +- .../postgresql/PostgreSQLCopyExportMapper.java | 2 +- .../SqlServerExportBatchOutputFormat.java | 2 +- .../sqlserver/SqlServerInputFormat.java | 4 +- .../sqlserver/SqlServerRecordReader.java | 8 +- .../sqlserver/SqlServerUpsertOutputFormat.java | 4 +- .../sqoop/metastore/GenericJobStorage.java | 8 +- .../org/apache/sqoop/metastore/JobData.java | 4 +- .../org/apache/sqoop/metastore/JobStorage.java | 1 - .../sqoop/metastore/JobStorageFactory.java | 3 +- .../sqoop/metastore/hsqldb/HsqldbMetaStore.java | 4 +- .../apache/sqoop/orm/AvroSchemaGenerator.java | 4 +- src/java/org/apache/sqoop/orm/ClassWriter.java | 26 +- .../apache/sqoop/orm/CompilationManager.java | 6 +- .../org/apache/sqoop/orm/TableClassName.java | 2 +- .../org/apache/sqoop/tool/BaseSqoopTool.java | 29 +- src/java/org/apache/sqoop/tool/CodeGenTool.java | 16 +- .../apache/sqoop/tool/CreateHiveTableTool.java | 12 +- src/java/org/apache/sqoop/tool/EvalSqlTool.java | 12 +- src/java/org/apache/sqoop/tool/ExportTool.java | 16 +- src/java/org/apache/sqoop/tool/HelpTool.java | 6 +- .../apache/sqoop/tool/ImportAllTablesTool.java | 12 +- src/java/org/apache/sqoop/tool/ImportTool.java | 30 +- src/java/org/apache/sqoop/tool/JobTool.java | 25 +- .../apache/sqoop/tool/ListDatabasesTool.java | 8 +- .../org/apache/sqoop/tool/ListTablesTool.java | 8 +- .../apache/sqoop/tool/MainframeImportTool.java | 8 +- src/java/org/apache/sqoop/tool/MergeTool.java | 12 +- .../org/apache/sqoop/tool/MetastoreTool.java | 12 +- src/java/org/apache/sqoop/tool/SqoopTool.java | 11 +- src/java/org/apache/sqoop/tool/ToolPlugin.java | 2 - src/java/org/apache/sqoop/tool/VersionTool.java | 6 +- src/java/org/apache/sqoop/util/AppendUtils.java | 4 +- .../org/apache/sqoop/util/CredentialsUtil.java | 2 +- .../apache/sqoop/util/DirectImportUtils.java | 10 +- .../apache/sqoop/util/ErrorableAsyncSink.java | 2 - src/java/org/apache/sqoop/util/Jars.java | 2 +- .../org/apache/sqoop/util/LoggingAsyncSink.java | 2 - .../org/apache/sqoop/util/LoggingUtils.java | 1 - .../org/apache/sqoop/util/NullAsyncSink.java | 2 - .../org/apache/sqoop/util/OptionsFileUtil.java | 2 +- .../sqoop/util/SubprocessSecurityManager.java | 2 +- src/java/org/apache/sqoop/util/TaskId.java | 2 +- src/perftest/ExportStressTest.java | 8 +- src/perftest/ExtConnFactoryTest.java | 14 +- src/perftest/ExtFactory.java | 6 +- src/perftest/LobFilePerfTest.java | 2 +- src/perftest/LobFileStressTest.java | 2 +- src/scripts/write-version-info.cmd | 28 - src/scripts/write-version-info.sh | 28 - src/test/com/cloudera/sqoop/TestAllTables.java | 252 ---- .../com/cloudera/sqoop/TestAppendUtils.java | 315 ---- src/test/com/cloudera/sqoop/TestAvroExport.java | 536 ------- src/test/com/cloudera/sqoop/TestAvroImport.java | 382 ----- .../sqoop/TestAvroImportExportRoundtrip.java | 270 ---- .../com/cloudera/sqoop/TestBoundaryQuery.java | 187 --- .../com/cloudera/sqoop/TestColumnTypes.java | 80 -- .../com/cloudera/sqoop/TestCompression.java | 202 --- .../com/cloudera/sqoop/TestConnFactory.java | 198 --- .../com/cloudera/sqoop/TestDirectImport.java | 81 -- src/test/com/cloudera/sqoop/TestExport.java | 1086 -------------- .../com/cloudera/sqoop/TestExportUpdate.java | 710 --------- .../cloudera/sqoop/TestFreeFormQueryImport.java | 159 --- .../cloudera/sqoop/TestIncrementalImport.java | 1348 ------------------ src/test/com/cloudera/sqoop/TestMerge.java | 379 ----- src/test/com/cloudera/sqoop/TestMultiCols.java | 241 ---- src/test/com/cloudera/sqoop/TestMultiMaps.java | 188 --- .../com/cloudera/sqoop/TestParquetExport.java | 459 ------ .../com/cloudera/sqoop/TestParquetImport.java | 357 ----- src/test/com/cloudera/sqoop/TestQuery.java | 193 --- src/test/com/cloudera/sqoop/TestSplitBy.java | 166 --- .../com/cloudera/sqoop/TestSqoopOptions.java | 797 ----------- src/test/com/cloudera/sqoop/TestTargetDir.java | 156 -- src/test/com/cloudera/sqoop/TestWhere.java | 183 --- .../sqoop/hbase/HBaseImportAddRowKeyTest.java | 138 -- .../sqoop/hbase/HBaseImportNullTest.java | 62 - .../cloudera/sqoop/hbase/HBaseImportTest.java | 147 -- .../sqoop/hbase/HBaseImportTypesTest.java | 40 - .../hbase/HBaseKerberizedConnectivityTest.java | 33 - .../sqoop/hbase/HBaseQueryImportTest.java | 69 - .../com/cloudera/sqoop/hbase/HBaseTestCase.java | 304 ---- .../com/cloudera/sqoop/hbase/HBaseUtilTest.java | 46 - .../com/cloudera/sqoop/hive/TestHiveImport.java | 743 ---------- .../cloudera/sqoop/hive/TestTableDefWriter.java | 289 ---- .../com/cloudera/sqoop/io/TestCodecMap.java | 92 -- src/test/com/cloudera/sqoop/io/TestLobFile.java | 642 --------- .../com/cloudera/sqoop/io/TestNamedFifo.java | 209 --- .../sqoop/io/TestSplittableBufferedWriter.java | 318 ----- .../com/cloudera/sqoop/lib/TestBlobRef.java | 155 -- .../cloudera/sqoop/lib/TestBooleanParser.java | 57 - .../com/cloudera/sqoop/lib/TestClobRef.java | 167 --- .../cloudera/sqoop/lib/TestFieldFormatter.java | 150 -- .../sqoop/lib/TestLargeObjectLoader.java | 125 -- .../cloudera/sqoop/lib/TestRecordParser.java | 450 ------ .../sqoop/manager/CubridManagerExportTest.java | 306 ---- .../sqoop/manager/CubridManagerImportTest.java | 296 ---- .../manager/DB2ManagerImportManualTest.java | 290 ---- .../sqoop/manager/DirectMySQLExportTest.java | 363 ----- .../cloudera/sqoop/manager/DirectMySQLTest.java | 422 ------ .../DirectPostgreSQLExportManualTest.java | 189 --- .../sqoop/manager/JdbcMySQLExportTest.java | 186 --- .../sqoop/manager/MySQLAllTablesTest.java | 69 - .../cloudera/sqoop/manager/MySQLAuthTest.java | 276 ---- .../cloudera/sqoop/manager/MySQLCompatTest.java | 172 --- .../sqoop/manager/MySQLFreeFormQueryTest.java | 78 - .../sqoop/manager/MySQLLobAvroImportTest.java | 83 -- .../cloudera/sqoop/manager/MySQLTestUtils.java | 161 --- .../sqoop/manager/OracleCompatTest.java | 268 ---- .../sqoop/manager/OracleExportTest.java | 313 ---- .../sqoop/manager/OracleFreeFormQueryTest.java | 60 - .../sqoop/manager/OracleLobAvroImportTest.java | 89 -- .../sqoop/manager/OracleManagerTest.java | 556 -------- .../com/cloudera/sqoop/manager/OracleUtils.java | 101 -- .../manager/PGBulkloadManagerManualTest.java | 207 --- .../sqoop/manager/PostgresqlExportTest.java | 490 ------- .../PostgresqlExternalTableImportTest.java | 285 ---- .../sqoop/manager/PostgresqlImportTest.java | 466 ------ .../manager/SQLServerManagerExportTest.java | 473 ------ .../manager/SQLServerManagerImportTest.java | 370 ----- .../sqoop/manager/TestHsqldbManager.java | 86 -- .../cloudera/sqoop/manager/TestSqlManager.java | 253 ---- .../cloudera/sqoop/mapreduce/TestImportJob.java | 387 ----- .../db/TestDataDrivenDBInputFormat.java | 230 --- .../sqoop/mapreduce/db/TestIntegerSplitter.java | 37 - .../sqoop/mapreduce/db/TestTextSplitter.java | 37 - .../sqoop/metastore/JobToolTestBase.java | 215 --- .../MetaConnectIncrementalImportTestBase.java | 215 --- .../sqoop/metastore/SavedJobsTestBase.java | 311 ---- .../TestMetastoreConfigurationParameters.java | 120 -- .../sqoop/metastore/db2/DB2JobToolTest.java | 65 - .../DB2MetaConnectIncrementalImportTest.java | 65 - .../sqoop/metastore/db2/DB2SavedJobsTest.java | 66 - .../metastore/hsqldb/HsqldbJobToolTest.java | 38 - .../HsqldbMetaConnectIncrementalImportTest.java | 38 - .../metastore/hsqldb/HsqldbSavedJobsTest.java | 40 - .../sqoop/metastore/mysql/MySqlJobToolTest.java | 52 - .../MySqlMetaConnectIncrementalImportTest.java | 53 - .../metastore/mysql/MySqlSavedJobsTest.java | 53 - .../metastore/oracle/OracleJobToolTest.java | 51 - .../OracleMetaConnectIncrementalImportTest.java | 51 - .../metastore/oracle/OracleSavedJobsTest.java | 53 - .../metastore/postgres/PostgresJobToolTest.java | 53 - ...ostgresMetaConnectIncrementalImportTest.java | 53 - .../postgres/PostgresSavedJobsTest.java | 54 - .../sqlserver/SqlServerJobToolTest.java | 53 - ...lServerMetaConnectIncrementalImportTest.java | 53 - .../sqlserver/SqlServerSavedJobsTest.java | 55 - .../com/cloudera/sqoop/orm/TestClassWriter.java | 737 ---------- .../cloudera/sqoop/orm/TestParseMethods.java | 292 ---- .../sqoop/testutil/BaseSqoopTestCase.java | 624 -------- .../com/cloudera/sqoop/testutil/CommonArgs.java | 58 - .../com/cloudera/sqoop/testutil/DirUtil.java | 59 - .../sqoop/testutil/ExplicitSetMapper.java | 109 -- .../sqoop/testutil/ExportJobTestCase.java | 366 ----- .../sqoop/testutil/HsqldbTestServer.java | 294 ---- .../sqoop/testutil/ImportJobTestCase.java | 246 ---- .../sqoop/testutil/InjectableConnManager.java | 92 -- .../testutil/InjectableManagerFactory.java | 35 - .../sqoop/testutil/LobAvroImportTestCase.java | 397 ------ .../sqoop/testutil/ManagerCompatTestCase.java | 919 ------------ .../cloudera/sqoop/testutil/MockResultSet.java | 1038 -------------- .../cloudera/sqoop/testutil/ReparseMapper.java | 118 -- .../cloudera/sqoop/testutil/SeqFileReader.java | 86 -- .../com/cloudera/sqoop/tool/TestToolPlugin.java | 153 -- .../sqoop/util/TestOptionsFileExpansion.java | 436 ------ .../sqoop/util/TestSubstitutionUtils.java | 41 - src/test/findbugsExcludeFile.xml | 78 - src/test/org/apache/sqoop/TestAllTables.java | 252 ++++ src/test/org/apache/sqoop/TestAppendUtils.java | 315 ++++ .../org/apache/sqoop/TestAutoResetMapper.java | 2 +- src/test/org/apache/sqoop/TestAvroExport.java | 536 +++++++ src/test/org/apache/sqoop/TestAvroImport.java | 382 +++++ .../sqoop/TestAvroImportExportRoundtrip.java | 270 ++++ .../org/apache/sqoop/TestBigDecimalExport.java | 4 +- .../org/apache/sqoop/TestBigDecimalImport.java | 4 +- .../org/apache/sqoop/TestBoundaryQuery.java | 188 +++ src/test/org/apache/sqoop/TestColumnTypes.java | 80 ++ src/test/org/apache/sqoop/TestCompression.java | 203 +++ src/test/org/apache/sqoop/TestConnFactory.java | 200 +++ src/test/org/apache/sqoop/TestDirectImport.java | 81 ++ src/test/org/apache/sqoop/TestExport.java | 1087 ++++++++++++++ src/test/org/apache/sqoop/TestExportUpdate.java | 710 +++++++++ .../apache/sqoop/TestExportUsingProcedure.java | 2 - .../apache/sqoop/TestFreeFormQueryImport.java | 159 +++ .../org/apache/sqoop/TestIncrementalImport.java | 1348 ++++++++++++++++++ src/test/org/apache/sqoop/TestMerge.java | 375 +++++ src/test/org/apache/sqoop/TestMultiCols.java | 241 ++++ src/test/org/apache/sqoop/TestMultiMaps.java | 189 +++ .../org/apache/sqoop/TestParquetExport.java | 459 ++++++ .../org/apache/sqoop/TestParquetImport.java | 355 +++++ src/test/org/apache/sqoop/TestQuery.java | 194 +++ src/test/org/apache/sqoop/TestSplitBy.java | 167 +++ .../apache/sqoop/TestSqoopJobDataPublisher.java | 16 +- src/test/org/apache/sqoop/TestSqoopOptions.java | 773 +++++++++- src/test/org/apache/sqoop/TestTargetDir.java | 156 ++ src/test/org/apache/sqoop/TestWhere.java | 184 +++ .../apache/sqoop/accumulo/AccumuloTestCase.java | 4 +- .../credentials/TestPassingSecurePassword.java | 9 +- .../sqoop/hbase/HBaseImportAddRowKeyTest.java | 138 ++ .../apache/sqoop/hbase/HBaseImportNullTest.java | 62 + .../org/apache/sqoop/hbase/HBaseImportTest.java | 147 ++ .../sqoop/hbase/HBaseImportTypesTest.java | 40 + .../hbase/HBaseKerberizedConnectivityTest.java | 33 + .../sqoop/hbase/HBaseQueryImportTest.java | 69 + .../org/apache/sqoop/hbase/HBaseTestCase.java | 304 ++++ .../org/apache/sqoop/hbase/HBaseUtilTest.java | 46 + .../sqoop/hbase/TestHBasePutProcessor.java | 2 +- .../apache/sqoop/hcat/HCatalogExportTest.java | 4 +- .../apache/sqoop/hcat/HCatalogImportTest.java | 13 +- .../apache/sqoop/hcat/HCatalogTestUtils.java | 6 +- .../apache/sqoop/hcat/TestHCatalogBasic.java | 6 +- .../org/apache/sqoop/hive/TestHiveImport.java | 743 ++++++++++ .../apache/sqoop/hive/TestTableDefWriter.java | 325 +++-- .../TestTableDefWriterForExternalTable.java | 126 ++ src/test/org/apache/sqoop/io/TestCodecMap.java | 92 ++ src/test/org/apache/sqoop/io/TestLobFile.java | 642 +++++++++ src/test/org/apache/sqoop/io/TestNamedFifo.java | 209 +++ .../sqoop/io/TestSplittableBufferedWriter.java | 318 +++++ src/test/org/apache/sqoop/lib/TestBlobRef.java | 155 ++ .../org/apache/sqoop/lib/TestBooleanParser.java | 57 + src/test/org/apache/sqoop/lib/TestClobRef.java | 167 +++ .../apache/sqoop/lib/TestFieldFormatter.java | 150 ++ .../apache/sqoop/lib/TestLargeObjectLoader.java | 124 ++ .../org/apache/sqoop/lib/TestRecordParser.java | 450 ++++++ .../manager/TestDefaultManagerFactory.java | 4 +- .../sqoop/manager/TestMainframeManager.java | 12 +- .../apache/sqoop/manager/TestSqlManager.java | 227 ++- .../sqoop/manager/cubrid/CubridAuthTest.java | 6 +- .../sqoop/manager/cubrid/CubridCompatTest.java | 4 +- .../manager/cubrid/CubridManagerExportTest.java | 305 ++++ .../manager/cubrid/CubridManagerImportTest.java | 297 ++++ .../DB2ImportAllTableWithSchemaManualTest.java | 11 +- .../manager/db2/DB2ManagerImportManualTest.java | 291 ++++ .../manager/db2/DB2XmlTypeImportManualTest.java | 8 +- .../sqoop/manager/hsqldb/TestHsqldbManager.java | 87 ++ .../manager/mysql/DirectMySQLExportTest.java | 364 +++++ .../sqoop/manager/mysql/DirectMySQLTest.java | 425 ++++++ .../manager/mysql/JdbcMySQLExportTest.java | 187 +++ .../sqoop/manager/mysql/MySQLAllTablesTest.java | 69 + .../sqoop/manager/mysql/MySQLAuthTest.java | 277 ++++ .../sqoop/manager/mysql/MySQLCompatTest.java | 172 +++ .../manager/mysql/MySQLFreeFormQueryTest.java | 78 + .../manager/mysql/MySQLLobAvroImportTest.java | 83 ++ .../sqoop/manager/mysql/MySQLTestUtils.java | 161 +++ .../manager/mysql/MySqlCallExportTest.java | 7 +- .../mysql/MySqlColumnEscapeImportTest.java | 7 +- .../netezza/DirectNetezzaExportManualTest.java | 2 +- .../DirectNetezzaHCatExportManualTest.java | 2 +- .../DirectNetezzaHCatImportManualTest.java | 2 +- .../netezza/NetezzaExportManualTest.java | 8 +- .../netezza/NetezzaImportManualTest.java | 10 +- .../sqoop/manager/netezza/NetezzaTestUtils.java | 2 +- ...aDrivenDBInputFormatConnectionCloseTest.java | 2 +- .../manager/oracle/OraOopOracleQueriesTest.java | 2 +- .../sqoop/manager/oracle/OraOopTestCase.java | 5 +- .../manager/oracle/OracleCallExportTest.java | 8 +- .../oracle/OracleColumnEscapeImportTest.java | 8 +- .../sqoop/manager/oracle/OracleCompatTest.java | 269 ++++ .../oracle/OracleConnectionFactoryTest.java | 2 +- .../sqoop/manager/oracle/OracleExportTest.java | 315 ++++ .../manager/oracle/OracleFreeFormQueryTest.java | 61 + .../oracle/OracleIncrementalImportTest.java | 8 +- .../manager/oracle/OracleLobAvroImportTest.java | 90 ++ .../sqoop/manager/oracle/OracleManagerTest.java | 560 ++++++++ .../OracleSpecialCharacterTableImportTest.java | 8 +- .../manager/oracle/OracleSplitterTest.java | 18 +- .../sqoop/manager/oracle/SystemImportTest.java | 8 +- .../TestOraOopDataDrivenDBInputFormat.java | 2 +- .../sqoop/manager/oracle/util/OracleUtils.java | 102 ++ .../DirectPostgreSQLExportManualTest.java | 189 +++ .../postgresql/PGBulkloadManagerManualTest.java | 207 +++ .../postgresql/PostgresqlExportTest.java | 492 +++++++ .../PostgresqlExternalTableImportTest.java | 287 ++++ .../postgresql/PostgresqlImportTest.java | 468 ++++++ .../manager/sqlserver/ManagerCompatExport.java | 8 +- ...SQLServerDatatypeExportSequenceFileTest.java | 10 +- ...QLServerDatatypeImportDelimitedFileTest.java | 12 +- ...SQLServerDatatypeImportSequenceFileTest.java | 4 +- .../sqlserver/SQLServerHiveImportTest.java | 8 +- .../sqlserver/SQLServerManagerExportTest.java | 474 ++++++ .../sqlserver/SQLServerManagerImportTest.java | 371 +++++ .../manager/sqlserver/SQLServerManagerTest.java | 14 +- .../sqlserver/SQLServerMultiColsTest.java | 4 +- .../sqlserver/SQLServerMultiMapsTest.java | 18 +- .../sqlserver/SQLServerParseMethodsTest.java | 18 +- .../manager/sqlserver/SQLServerQueryTest.java | 16 +- .../manager/sqlserver/SQLServerSplitByTest.java | 16 +- .../manager/sqlserver/SQLServerWhereTest.java | 16 +- .../apache/sqoop/mapreduce/TestImportJob.java | 387 +++++ .../sqoop/mapreduce/TestJdbcExportJob.java | 6 +- .../org/apache/sqoop/mapreduce/TestJobBase.java | 3 +- .../mapreduce/db/TestBigDecimalSplitter.java | 1 - .../db/TestDataDrivenDBInputFormat.java | 232 +++ .../sqoop/mapreduce/db/TestIntegerSplitter.java | 1 - .../db/TestSQLServerDBRecordReader.java | 8 +- .../sqoop/mapreduce/db/TestTextSplitter.java | 1 - .../TextSplitterHadoopConfIntegrationTest.java | 2 +- .../TestMainframeDatasetFTPRecordReader.java | 4 +- .../TestMainframeDatasetInputFormat.java | 2 +- .../mainframe/TestMainframeImportJob.java | 4 +- .../apache/sqoop/metastore/JobToolTestBase.java | 215 +++ .../MetaConnectIncrementalImportTestBase.java | 215 +++ .../sqoop/metastore/SavedJobsTestBase.java | 314 ++++ .../TestMetastoreConfigurationParameters.java | 120 ++ .../sqoop/metastore/db2/DB2JobToolTest.java | 65 + .../DB2MetaConnectIncrementalImportTest.java | 65 + .../sqoop/metastore/db2/DB2SavedJobsTest.java | 66 + .../metastore/hsqldb/HsqldbJobToolTest.java | 38 + .../HsqldbMetaConnectIncrementalImportTest.java | 38 + .../metastore/hsqldb/HsqldbSavedJobsTest.java | 40 + .../sqoop/metastore/mysql/MySqlJobToolTest.java | 52 + .../MySqlMetaConnectIncrementalImportTest.java | 53 + .../metastore/mysql/MySqlSavedJobsTest.java | 53 + .../metastore/oracle/OracleJobToolTest.java | 51 + .../OracleMetaConnectIncrementalImportTest.java | 51 + .../metastore/oracle/OracleSavedJobsTest.java | 53 + .../metastore/postgres/PostgresJobToolTest.java | 53 + ...ostgresMetaConnectIncrementalImportTest.java | 53 + .../postgres/PostgresSavedJobsTest.java | 54 + .../sqlserver/SqlServerJobToolTest.java | 53 + ...lServerMetaConnectIncrementalImportTest.java | 53 + .../sqlserver/SqlServerSavedJobsTest.java | 55 + .../org/apache/sqoop/orm/TestClassWriter.java | 737 ++++++++++ .../sqoop/orm/TestCompilationManager.java | 2 +- .../org/apache/sqoop/orm/TestParseMethods.java | 296 ++++ .../sqoop/testutil/BaseSqoopTestCase.java | 624 ++++++++ .../org/apache/sqoop/testutil/CommonArgs.java | 58 + src/test/org/apache/sqoop/testutil/DirUtil.java | 59 + .../sqoop/testutil/ExplicitSetMapper.java | 109 ++ .../sqoop/testutil/ExportJobTestCase.java | 366 +++++ .../apache/sqoop/testutil/HsqldbTestServer.java | 294 ++++ .../sqoop/testutil/ImportJobTestCase.java | 245 ++++ .../sqoop/testutil/InjectableConnManager.java | 92 ++ .../testutil/InjectableManagerFactory.java | 36 + .../sqoop/testutil/LobAvroImportTestCase.java | 397 ++++++ .../sqoop/testutil/ManagerCompatTestCase.java | 919 ++++++++++++ .../apache/sqoop/testutil/MockResultSet.java | 1038 ++++++++++++++ .../apache/sqoop/testutil/ReparseMapper.java | 118 ++ .../apache/sqoop/testutil/SeqFileReader.java | 86 ++ .../tool/ImportToolValidateOptionsTest.java | 10 +- .../apache/sqoop/tool/TestBaseSqoopTool.java | 2 +- .../tool/TestExportToolValidateOptions.java | 2 +- .../org/apache/sqoop/tool/TestImportTool.java | 12 +- .../sqoop/tool/TestMainframeImportTool.java | 9 +- .../org/apache/sqoop/tool/TestToolPlugin.java | 153 ++ .../sqoop/tool/TestValidateImportOptions.java | 2 +- .../sqoop/util/TestOptionsFileExpansion.java | 437 ++++++ .../sqoop/util/TestSubstitutionUtils.java | 41 + .../validation/AbortOnFailureHandlerTest.java | 2 +- .../validation/RowCountValidatorImportTest.java | 7 +- 665 files changed, 29666 insertions(+), 37223 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 2094bae..a9dbdd5 100644 --- a/build.xml +++ b/build.xml @@ -132,8 +132,6 @@ value="${findbugs.out.dir}/report.xml" /> <property name="findbugs.output.html.file" value="${findbugs.out.dir}/report.html" /> - <property name="findbugs.excludes" - location="${test.dir}/findbugsExcludeFile.xml" /> <!-- maven --> <property name="mvn.build.dir" value="${build.dir}/m2" /> @@ -449,7 +447,7 @@ <if> <equals arg1="${windows}" arg2="true" /> <then> - <java classname="com.cloudera.sqoop.Sqoop" + <java classname="org.apache.sqoop.Sqoop" fork="true" failonerror="true" output="${build.dir}/tools-list" @@ -466,7 +464,7 @@ </exec> </then> <else> - <java classname="com.cloudera.sqoop.Sqoop" + <java classname="org.apache.sqoop.Sqoop" fork="true" failonerror="true" output="${build.dir}/tools-list" @@ -1097,7 +1095,6 @@ doctitle="${Name} ${version} API" bottom="Copyright &copy; ${year} The Apache Software Foundation"> <packageset dir="${src.dir}"> - <include name="com/cloudera/sqoop/lib/**" /> <include name="org/apache/sqoop/lib/**" /> </packageset> <classpath> @@ -1134,7 +1131,7 @@ <mkdir dir="${findbugs.out.dir}"/> <findbugs home="${findbugs.home}" output="xml:withMessages" outputFile="${findbugs.output.xml.file}" effort="max" - excludeFilter="${findbugs.excludes}" jvmargs="-Xms512m -Xmx512m"> + jvmargs="-Xms512m -Xmx512m"> <auxClasspath> <path refid="test.classpath"/> </auxClasspath> http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/conf/sqoop-site-template.xml ---------------------------------------------------------------------- diff --git a/conf/sqoop-site-template.xml b/conf/sqoop-site-template.xml index 2182da3..a906cb4 100644 --- a/conf/sqoop-site-template.xml +++ b/conf/sqoop-site-template.xml @@ -38,7 +38,7 @@ under the License. <!-- <property> <name>sqoop.connection.factories</name> - <value>com.cloudera.sqoop.manager.DefaultManagerFactory</value> + <value>org.apache.sqoop.manager.DefaultManagerFactory</value> <description>A comma-delimited list of ManagerFactory implementations which are consulted, in order, to instantiate ConnManager instances used to drive connections to databases. http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/ivy.xml ---------------------------------------------------------------------- diff --git a/ivy.xml b/ivy.xml index d153038..6be4fa2 100644 --- a/ivy.xml +++ b/ivy.xml @@ -20,7 +20,7 @@ under the License. <ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd";> - <info organisation="com.cloudera.sqoop" module="${name}"> + <info organisation="org.apache.sqoop" module="${name}"> <license name="Apache 2.0"/> <ivyauthor name="Sqoop Team" url="http://github.com/cloudera/sqoop"; /> <description> http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/docs/dev/api-reference.txt ---------------------------------------------------------------------- diff --git a/src/docs/dev/api-reference.txt b/src/docs/dev/api-reference.txt index 80453ee..46a57ee 100644 --- a/src/docs/dev/api-reference.txt +++ b/src/docs/dev/api-reference.txt @@ -49,10 +49,10 @@ convenience methods: The full set of methods guaranteed to exist in an auto-generated class is specified in the abstract class -+com.cloudera.sqoop.lib.SqoopRecord+. ++org.apache.sqoop.lib.SqoopRecord+. Instances of +SqoopRecord+ may depend on Sqoop's public API. This is all classes -in the +com.cloudera.sqoop.lib+ package. These are briefly described below. +in the +org.apache.sqoop.lib+ package. These are briefly described below. Clients of Sqoop should not need to directly interact with any of these classes, although classes generated by Sqoop will depend on them. Therefore, these APIs are considered public and care will be taken when forward-evolving them. @@ -82,11 +82,11 @@ While Sqoop uses JDBC and +DataDrivenDBInputFormat+ to read from databases, differences in the SQL supported by different vendors as well as JDBC metadata necessitates vendor-specific codepaths for most databases. Sqoop's solution to this problem is by introducing the +ConnManager+ API -(+com.cloudera.sqoop.manager.ConnMananger+). +(+org.apache.sqoop.manager.ConnMananger+). +ConnManager+ is an abstract class defining all methods that interact with the database itself. Most implementations of +ConnManager+ will extend the -+com.cloudera.sqoop.manager.SqlManager+ abstract class, which uses standard ++org.apache.sqoop.manager.SqlManager+ abstract class, which uses standard SQL to perform most actions. Subclasses are required to implement the +getConnection()+ method which returns the actual JDBC connection to the database. Subclasses are free to override all other methods as well. The @@ -118,7 +118,7 @@ lightweight operation, and is done reasonably infrequently. Therefore, class +ManagerFactory+ (See http://issues.apache.org/jira/browse/MAPREDUCE-750[]). One +ManagerFactory+ implementation currently serves all of Sqoop: -+com.cloudera.sqoop.manager.DefaultManagerFactory+. Extensions ++org.apache.sqoop.manager.DefaultManagerFactory+. Extensions should not modify +DefaultManagerFactory+. Instead, an extension-specific +ManagerFactory+ implementation should be provided with the new +ConnManager+. +ManagerFactory+ has a single method of @@ -133,7 +133,7 @@ and +ConnManager+(s), and configure +sqoop-site.xml+ to use the new +ManagerFactory+. The +DefaultManagerFactory+ principly discriminates between databases by parsing the connect string stored in +SqoopOptions+. -Extension authors may make use of classes in the +com.cloudera.sqoop.io+, +Extension authors may make use of classes in the +org.apache.sqoop.io+, +mapreduce+, and +util+ packages to facilitate their implementations. These packages and classes are described in more detail in the following section. @@ -149,7 +149,7 @@ HBase, it must be transformed into a format HBase can accept. Specifically: * Values must be serialized to byte arrays to put into cells. All of this is done via +Put+ statements in the HBase client API. -Sqoop's interaction with HBase is performed in the +com.cloudera.sqoop.hbase+ +Sqoop's interaction with HBase is performed in the +org.apache.sqoop.hbase+ package. Records are deserialzed from the database and emitted from the mapper. The OutputFormat is responsible for inserting the results into HBase. This is done through an interface called +PutTransformer+. The +PutTransformer+ @@ -179,7 +179,7 @@ Sqoop Internals This section describes the internal architecture of Sqoop. -The Sqoop program is driven by the +com.cloudera.sqoop.Sqoop+ main class. +The Sqoop program is driven by the +org.apache.sqoop.Sqoop+ main class. A limited number of additional classes are in the same package; +SqoopOptions+ (described earlier) and +ConnFactory+ (which manipulates +ManagerFactory+ instances). @@ -189,7 +189,7 @@ General program flow The general program flow is as follows: -+com.cloudera.sqoop.Sqoop+ is the main class and implements _Tool_. A new ++org.apache.sqoop.Sqoop+ is the main class and implements _Tool_. A new instance is launched with +ToolRunner+. The first argument to Sqoop is a string identifying the name of a +SqoopTool+ to run. The +SqoopTool+ itself drives the execution of the user's requested operation (e.g., @@ -214,8 +214,8 @@ the +ConnManager.importTable()+ method is left to determine how best to run the import. Each main action is actually controlled by the +ConnMananger+, except for the generating of code, which is done by the +CompilationManager+ and +ClassWriter+. (Both in the -+com.cloudera.sqoop.orm+ package.) Importing into Hive is also -taken care of via the +com.cloudera.sqoop.hive.HiveImport+ class ++org.apache.sqoop.orm+ package.) Importing into Hive is also +taken care of via the +org.apache.sqoop.hive.HiveImport+ class after the +importTable()+ has completed. This is done without concern for the +ConnManager+ implementation used. @@ -231,7 +231,7 @@ related data. Subpackages ^^^^^^^^^^^ -The following subpackages under +com.cloudera.sqoop+ exist: +The following subpackages under +org.apache.sqoop+ exist: * +hive+ - Facilitates importing data to Hive. * +io+ - Implementations of +java.io.*+ interfaces (namely, _OutputStream_ and @@ -288,7 +288,7 @@ more. Consequently, these must both be handled, and preferably asynchronously. In Sqoop parlance, an "async sink" is a thread that takes an +InputStream+ and reads it to completion. These are realized by +AsyncSink+ implementations. The -+com.cloudera.sqoop.util.AsyncSink+ abstract class defines the operations ++org.apache.sqoop.util.AsyncSink+ abstract class defines the operations this factory must perform. +processStream()+ will spawn another thread to immediately begin handling the data read from the +InputStream+ argument; it must read this stream to completion. The +join()+ method allows external threads @@ -311,7 +311,7 @@ Sqoop schedules MapReduce jobs to effect imports and exports. Configuration and execution of MapReduce jobs follows a few common steps (configuring the +InputFormat+; configuring the +OutputFormat+; setting the +Mapper+ implementation; etc...). These steps are -formalized in the +com.cloudera.sqoop.mapreduce.JobBase+ class. +formalized in the +org.apache.sqoop.mapreduce.JobBase+ class. The +JobBase+ allows a user to specify the +InputFormat+, +OutputFormat+, and +Mapper+ to use. http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/docs/sip/sip-4.txt ---------------------------------------------------------------------- diff --git a/src/docs/sip/sip-4.txt b/src/docs/sip/sip-4.txt index 9664125..fb4dba5 100644 --- a/src/docs/sip/sip-4.txt +++ b/src/docs/sip/sip-4.txt @@ -83,7 +83,7 @@ A well-defined programmatic entry-point to Sqoop is *not* defined by this specif h3. Base package -The base package in Sqoop is currently @org.apache.hadoop.sqoop@. To reflect Sqoop's migration from an Apache Hadoop subproject to its own project, the class hierarchy should be moved to @com.cloudera.sqoop@. +The base package in Sqoop is currently @org.apache.hadoop.sqoop@. h2. Compatibility Issues http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/ConnFactory.java ---------------------------------------------------------------------- diff --git a/src/java/com/cloudera/sqoop/ConnFactory.java b/src/java/com/cloudera/sqoop/ConnFactory.java deleted file mode 100644 index f75cb4e..0000000 --- a/src/java/com/cloudera/sqoop/ConnFactory.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.cloudera.sqoop; - -import org.apache.hadoop.conf.Configuration; - -/** - * @deprecated Moving to use org.apache.sqoop namespace. - */ -public class ConnFactory - extends org.apache.sqoop.ConnFactory { - - public static final String FACTORY_CLASS_NAMES_KEY = - org.apache.sqoop.ConnFactory.FACTORY_CLASS_NAMES_KEY; - - public static final String DEFAULT_FACTORY_CLASS_NAMES = - org.apache.sqoop.ConnFactory.DEFAULT_FACTORY_CLASS_NAMES; - - public ConnFactory(Configuration conf) { - super(conf); - } - -} - http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/Sqoop.java ---------------------------------------------------------------------- diff --git a/src/java/com/cloudera/sqoop/Sqoop.java b/src/java/com/cloudera/sqoop/Sqoop.java deleted file mode 100644 index 8ec9f8f..0000000 --- a/src/java/com/cloudera/sqoop/Sqoop.java +++ /dev/null @@ -1,70 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.cloudera.sqoop; - -import org.apache.commons.logging.Log; -import org.apache.hadoop.conf.Configuration; -import com.cloudera.sqoop.tool.SqoopTool; - -/** - * @deprecated Moving to use org.apache.sqoop namespace. - */ -public class Sqoop - extends org.apache.sqoop.Sqoop { - - public static final Log SQOOP_LOG = - org.apache.sqoop.Sqoop.SQOOP_LOG; - - public static final String SQOOP_OPTIONS_FILE_SPECIFIER = - org.apache.sqoop.Sqoop.SQOOP_OPTIONS_FILE_SPECIFIER; - - static { - Configuration.addDefaultResource("sqoop-site.xml"); - } - - public static int runSqoop(Sqoop sqoop, String [] args) { - return org.apache.sqoop.Sqoop.runSqoop(sqoop, args); - } - - public static int runTool(String [] args, Configuration conf) { - return org.apache.sqoop.Sqoop.runTool(args, conf); - } - - public static int runTool(String [] args) { - return org.apache.sqoop.Sqoop.runTool(args); - } - - public static void main(String [] args) { - org.apache.sqoop.Sqoop.main(args); - } - - public Sqoop(SqoopTool tool) { - super(tool); - } - - public Sqoop(SqoopTool tool, Configuration conf) { - super(tool, conf); - } - - public Sqoop(SqoopTool tool, Configuration conf, SqoopOptions opts) { - super(tool, conf, opts); - } - -} - http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/SqoopOptions.java ---------------------------------------------------------------------- diff --git a/src/java/com/cloudera/sqoop/SqoopOptions.java b/src/java/com/cloudera/sqoop/SqoopOptions.java deleted file mode 100644 index 0863ef6..0000000 --- a/src/java/com/cloudera/sqoop/SqoopOptions.java +++ /dev/null @@ -1,121 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.cloudera.sqoop; - -import org.apache.hadoop.conf.Configuration; - -/** - * @deprecated - */ -public class SqoopOptions - extends org.apache.sqoop.SqoopOptions implements Cloneable { - - public static final String METASTORE_PASSWORD_KEY = - org.apache.sqoop.SqoopOptions.METASTORE_PASSWORD_KEY; - - public static final boolean METASTORE_PASSWORD_DEFAULT = - org.apache.sqoop.SqoopOptions.METASTORE_PASSWORD_DEFAULT; - - public static final int DEFAULT_NUM_MAPPERS = - org.apache.sqoop.SqoopOptions.DEFAULT_NUM_MAPPERS; - - /** Selects in-HDFS destination file format. */ - public enum FileLayout { - TextFile, - SequenceFile, - AvroDataFile, - ParquetFile - } - - /** - * Incremental imports support two modes: - * <ul> - * <li>new rows being appended to the end of a table with an - * incrementing id</li> - * <li>new data results in a date-last-modified column being - * updated to NOW(); Sqoop will pull all dirty rows in the next - * incremental import.</li> - * </ul> - */ - public enum IncrementalMode { - None, - AppendRows, - DateLastModified, - } - - /** - * Update mode option specifies how updates are performed when - * new rows are found with non-matching keys in database. - * It supports two modes: - * <ul> - * <li>UpdateOnly: This is the default. New rows are silently ignored.</li> - * <li>AllowInsert: New rows are inserted into the database.</li> - * </ul> - */ - public enum UpdateMode { - UpdateOnly, - AllowInsert - } - - public SqoopOptions() { - super(); - } - - public SqoopOptions(Configuration conf) { - super(conf); - } - - public SqoopOptions(final String connect, final String table) { - super(connect, table); - } - - public static void clearNonceDir() { - org.apache.sqoop.SqoopOptions.clearNonceDir(); - } - - public static String getHiveHomeDefault() { - return org.apache.sqoop.SqoopOptions.getHiveHomeDefault(); - } - - public static boolean isSqoopRethrowSystemPropertySet() { - return org.apache.sqoop.SqoopOptions.isSqoopRethrowSystemPropertySet(); - } - - /** - * {@inheritDoc}. - * @deprecated - */ - public static class InvalidOptionsException - extends org.apache.sqoop.SqoopOptions.InvalidOptionsException { - - - public InvalidOptionsException(final String msg) { - super(msg); - } - } - - public static char toChar(String charish) throws InvalidOptionsException { - try { - return org.apache.sqoop.SqoopOptions.toChar(charish); - } catch(org.apache.sqoop.SqoopOptions.InvalidOptionsException ex) { - throw new InvalidOptionsException(ex.getMessage()); - } - } -} - http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/cli/RelatedOptions.java ---------------------------------------------------------------------- diff --git a/src/java/com/cloudera/sqoop/cli/RelatedOptions.java b/src/java/com/cloudera/sqoop/cli/RelatedOptions.java deleted file mode 100644 index c6453b7..0000000 --- a/src/java/com/cloudera/sqoop/cli/RelatedOptions.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.cloudera.sqoop.cli; - -/** - * @deprecated Moving to use org.apache.sqoop namespace. - */ -public class RelatedOptions - extends org.apache.sqoop.cli.RelatedOptions { - - public RelatedOptions() { - super(); - } - - public RelatedOptions(final String title) { - super(title); - } -} - http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/cli/SqoopParser.java ---------------------------------------------------------------------- diff --git a/src/java/com/cloudera/sqoop/cli/SqoopParser.java b/src/java/com/cloudera/sqoop/cli/SqoopParser.java deleted file mode 100644 index 0c6d84e..0000000 --- a/src/java/com/cloudera/sqoop/cli/SqoopParser.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.cloudera.sqoop.cli; - -/** - * @deprecated Moving to use org.apache.sqoop namespace. - */ -public class SqoopParser - extends org.apache.sqoop.cli.SqoopParser { -} - http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/cli/ToolOptions.java ---------------------------------------------------------------------- diff --git a/src/java/com/cloudera/sqoop/cli/ToolOptions.java b/src/java/com/cloudera/sqoop/cli/ToolOptions.java deleted file mode 100644 index 0b5da6c..0000000 --- a/src/java/com/cloudera/sqoop/cli/ToolOptions.java +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.cloudera.sqoop.cli; - -/** - * @deprecated Moving to use org.apache.sqoop namespace. - */ -public class ToolOptions - extends org.apache.sqoop.cli.ToolOptions { -} - http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/config/ConfigurationConstants.java ---------------------------------------------------------------------- diff --git a/src/java/com/cloudera/sqoop/config/ConfigurationConstants.java b/src/java/com/cloudera/sqoop/config/ConfigurationConstants.java deleted file mode 100644 index 72e7df1..0000000 --- a/src/java/com/cloudera/sqoop/config/ConfigurationConstants.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.cloudera.sqoop.config; - -/** - * @deprecated Moving to use org.apache.sqoop namespace. - */ -public final class ConfigurationConstants { - - public static final String PROP_MAPRED_TASK_ID = - org.apache.sqoop.config.ConfigurationConstants.PROP_MAPRED_TASK_ID; - public static final String PROP_JOB_LOCAL_DIRECTORY = - org.apache.sqoop.config.ConfigurationConstants.PROP_JOB_LOCAL_DIRECTORY; - public static final String PROP_MAPRED_MAP_TASKS = - org.apache.sqoop.config.ConfigurationConstants.PROP_MAPRED_MAP_TASKS; - public static final String PROP_MAPRED_MAP_TASKS_SPECULATIVE_EXEC = - org.apache.sqoop.config. - ConfigurationConstants.PROP_MAPRED_MAP_TASKS_SPECULATIVE_EXEC; - public static final String PROP_MAPRED_REDUCE_TASKS_SPECULATIVE_EXEC = - org.apache.sqoop.config. - ConfigurationConstants.PROP_MAPRED_REDUCE_TASKS_SPECULATIVE_EXEC; - public static final String PROP_MAPRED_JOB_TRACKER_ADDRESS = - org.apache.sqoop.config. - ConfigurationConstants.PROP_MAPRED_JOB_TRACKER_ADDRESS; - public static final String COUNTER_GROUP_MAPRED_TASK_COUNTERS = - org.apache.sqoop.config. - ConfigurationConstants.COUNTER_GROUP_MAPRED_TASK_COUNTERS; - public static final String COUNTER_MAP_OUTPUT_RECORDS = - org.apache.sqoop.config.ConfigurationConstants.COUNTER_MAP_OUTPUT_RECORDS; - public static final String COUNTER_MAP_INPUT_RECORDS = - org.apache.sqoop.config.ConfigurationConstants.COUNTER_MAP_INPUT_RECORDS; - - private ConfigurationConstants() { - } - -} http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/config/ConfigurationHelper.java ---------------------------------------------------------------------- diff --git a/src/java/com/cloudera/sqoop/config/ConfigurationHelper.java b/src/java/com/cloudera/sqoop/config/ConfigurationHelper.java deleted file mode 100644 index 0870497..0000000 --- a/src/java/com/cloudera/sqoop/config/ConfigurationHelper.java +++ /dev/null @@ -1,112 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.cloudera.sqoop.config; - -import java.io.IOException; - -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.mapreduce.Job; -import org.apache.hadoop.mapreduce.JobContext; - -/** - * @deprecated Moving to use org.apache.sqoop namespace. - */ -public final class ConfigurationHelper { - - public static void setJobNumMaps(Job job, int numMapTasks) { - org.apache.sqoop.config.ConfigurationHelper.setJobNumMaps(job, numMapTasks); - } - - public static int getJobNumMaps(JobContext job) { - return org.apache.sqoop.config.ConfigurationHelper.getJobNumMaps(job); - } - - public static long getNumMapOutputRecords(Job job) - throws IOException, InterruptedException { - return org.apache.sqoop.config. - ConfigurationHelper.getNumMapOutputRecords(job); - } - - public static long getNumMapInputRecords(Job job) - throws IOException, InterruptedException { - return org.apache.sqoop.config. - ConfigurationHelper.getNumMapInputRecords(job); - } - - public static int getConfNumMaps(Configuration conf) { - return org.apache.sqoop.config.ConfigurationHelper.getConfNumMaps(conf); - } - - public static void setJobMapSpeculativeExecution(Job job, boolean isEnabled) { - org.apache.sqoop.config. - ConfigurationHelper.setJobMapSpeculativeExecution(job, isEnabled); - } - - public static void setJobReduceSpeculativeExecution( - Job job, boolean isEnabled) { - org.apache.sqoop.config. - ConfigurationHelper.setJobReduceSpeculativeExecution(job, isEnabled); - } - - public static void setJobtrackerAddr(Configuration conf, String addr) { - org.apache.sqoop.config. - ConfigurationHelper.setJobtrackerAddr(conf, addr); - } - - public static String getDbInputClassProperty() { - return org.apache.sqoop.config. - ConfigurationHelper.getDbInputClassProperty(); - } - - public static String getDbUsernameProperty() { - return org.apache.sqoop.config. - ConfigurationHelper.getDbUsernameProperty(); - } - - public static String getDbPasswordProperty() { - return org.apache.sqoop.config. - ConfigurationHelper.getDbPasswordProperty(); - } - - public static String getDbUrlProperty() { - return org.apache.sqoop.config. - ConfigurationHelper.getDbUrlProperty(); - } - - public static String getDbInputTableNameProperty() { - return org.apache.sqoop.config. - ConfigurationHelper.getDbInputTableNameProperty(); - } - - - public static String getDbInputConditionsProperty() { - return org.apache.sqoop.config. - ConfigurationHelper.getDbInputConditionsProperty(); - } - - public static String [] parseGenericOptions( - Configuration conf, String [] args) throws IOException { - return org.apache.sqoop.config. - ConfigurationHelper.parseGenericOptions(conf, args); - } - - private ConfigurationHelper() { - // Disable explicit object creation - } - -} http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/hbase/HBasePutProcessor.java ---------------------------------------------------------------------- diff --git a/src/java/com/cloudera/sqoop/hbase/HBasePutProcessor.java b/src/java/com/cloudera/sqoop/hbase/HBasePutProcessor.java deleted file mode 100644 index 425b0f4..0000000 --- a/src/java/com/cloudera/sqoop/hbase/HBasePutProcessor.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.cloudera.sqoop.hbase; - -/** - * @deprecated Moving to use org.apache.sqoop namespace. - */ -public class HBasePutProcessor - extends org.apache.sqoop.hbase.HBasePutProcessor { - - public static final String TABLE_NAME_KEY = - org.apache.sqoop.hbase.HBasePutProcessor.TABLE_NAME_KEY; - public static final String COL_FAMILY_KEY = - org.apache.sqoop.hbase.HBasePutProcessor.COL_FAMILY_KEY; - public static final String ROW_KEY_COLUMN_KEY = - org.apache.sqoop.hbase.HBasePutProcessor.ROW_KEY_COLUMN_KEY; - public static final String TRANSFORMER_CLASS_KEY = - org.apache.sqoop.hbase.HBasePutProcessor.TRANSFORMER_CLASS_KEY; - -} http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/hbase/HBaseUtil.java ---------------------------------------------------------------------- diff --git a/src/java/com/cloudera/sqoop/hbase/HBaseUtil.java b/src/java/com/cloudera/sqoop/hbase/HBaseUtil.java deleted file mode 100644 index 6f1fba7..0000000 --- a/src/java/com/cloudera/sqoop/hbase/HBaseUtil.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.cloudera.sqoop.hbase; - -/** - * @deprecated Moving to use org.apache.sqoop namespace. - */ -public final class HBaseUtil { - - private HBaseUtil() { } - - /** - * This is a way to make this always return false for testing. - */ - public static void setAlwaysNoHBaseJarMode(boolean mode) { - org.apache.sqoop.hbase.HBaseUtil.setAlwaysNoHBaseJarMode(mode); - } - - public static boolean isHBaseJarPresent() { - return org.apache.sqoop.hbase.HBaseUtil.isHBaseJarPresent(); - } - -} http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/hbase/PutTransformer.java ---------------------------------------------------------------------- diff --git a/src/java/com/cloudera/sqoop/hbase/PutTransformer.java b/src/java/com/cloudera/sqoop/hbase/PutTransformer.java deleted file mode 100644 index b8ceab7..0000000 --- a/src/java/com/cloudera/sqoop/hbase/PutTransformer.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.cloudera.sqoop.hbase; - -/** - * @deprecated Moving to use org.apache.sqoop namespace. - */ -public abstract class PutTransformer - extends org.apache.sqoop.hbase.PutTransformer { -} http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/hbase/ToStringPutTransformer.java ---------------------------------------------------------------------- diff --git a/src/java/com/cloudera/sqoop/hbase/ToStringPutTransformer.java b/src/java/com/cloudera/sqoop/hbase/ToStringPutTransformer.java deleted file mode 100644 index 0c55b21..0000000 --- a/src/java/com/cloudera/sqoop/hbase/ToStringPutTransformer.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.cloudera.sqoop.hbase; - -/** - * @deprecated Moving to use org.apache.sqoop namespace. - */ -public class ToStringPutTransformer - extends org.apache.sqoop.hbase.ToStringPutTransformer { -} http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/hive/HiveImport.java ---------------------------------------------------------------------- diff --git a/src/java/com/cloudera/sqoop/hive/HiveImport.java b/src/java/com/cloudera/sqoop/hive/HiveImport.java deleted file mode 100644 index db1c1b3..0000000 --- a/src/java/com/cloudera/sqoop/hive/HiveImport.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.cloudera.sqoop.hive; - -import org.apache.hadoop.conf.Configuration; -import com.cloudera.sqoop.SqoopOptions; -import com.cloudera.sqoop.manager.ConnManager; - -/** - * @deprecated Moving to use org.apache.sqoop namespace. - */ -public class HiveImport - extends org.apache.sqoop.hive.HiveImport { - - public HiveImport(final SqoopOptions opts, final ConnManager connMgr, - final Configuration conf, final boolean generateOnly) { - super(opts, connMgr, conf, generateOnly); - } - -} - http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/hive/HiveTypes.java ---------------------------------------------------------------------- diff --git a/src/java/com/cloudera/sqoop/hive/HiveTypes.java b/src/java/com/cloudera/sqoop/hive/HiveTypes.java deleted file mode 100644 index e67f6b8..0000000 --- a/src/java/com/cloudera/sqoop/hive/HiveTypes.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.cloudera.sqoop.hive; - -/** - * @deprecated Moving to use org.apache.sqoop namespace. - */ -public final class HiveTypes { - - private HiveTypes() { } - - public static String toHiveType(int sqlType) { - return org.apache.sqoop.hive.HiveTypes.toHiveType(sqlType); - } - - public static boolean isHiveTypeImprovised(int sqlType) { - return org.apache.sqoop.hive.HiveTypes.isHiveTypeImprovised(sqlType); - } -} - http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/hive/TableDefWriter.java ---------------------------------------------------------------------- diff --git a/src/java/com/cloudera/sqoop/hive/TableDefWriter.java b/src/java/com/cloudera/sqoop/hive/TableDefWriter.java deleted file mode 100644 index d19e018..0000000 --- a/src/java/com/cloudera/sqoop/hive/TableDefWriter.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.cloudera.sqoop.hive; - -import org.apache.hadoop.conf.Configuration; - -import com.cloudera.sqoop.SqoopOptions; -import com.cloudera.sqoop.manager.ConnManager; - -/** - * @deprecated Moving to use org.apache.sqoop namespace. - */ -public class TableDefWriter - extends org.apache.sqoop.hive.TableDefWriter { - - public TableDefWriter(final SqoopOptions opts, final ConnManager connMgr, - final String inputTable, final String outputTable, - final Configuration config, final boolean withComments) { - super(opts, connMgr, inputTable, outputTable, config, withComments); - } - - public static String getHiveOctalCharCode(int charNum) { - return org.apache.sqoop.hive.TableDefWriter.getHiveOctalCharCode(charNum); - } - -} - http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/io/CodecMap.java ---------------------------------------------------------------------- diff --git a/src/java/com/cloudera/sqoop/io/CodecMap.java b/src/java/com/cloudera/sqoop/io/CodecMap.java deleted file mode 100644 index 647cedc..0000000 --- a/src/java/com/cloudera/sqoop/io/CodecMap.java +++ /dev/null @@ -1,84 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.cloudera.sqoop.io; - -import java.util.Set; - -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.io.compress.CompressionCodec; - -/** - * Provides a mapping from codec names to concrete implementation class names. - * - * @deprecated use org.apache.sqoop.io.CodecMap instead. - * @see org.apache.sqoop.io.CodecMap - */ -public final class CodecMap { - - // Supported codec map values - // Note: do not add more values here, since codecs are discovered using the - // standard Hadoop mechanism (io.compression.codecs). See - // CompressionCodecFactory. - public static final String NONE = org.apache.sqoop.io.CodecMap.NONE; - public static final String DEFLATE = org.apache.sqoop.io.CodecMap.DEFLATE; - public static final String LZO = org.apache.sqoop.io.CodecMap.LZO; - public static final String LZOP = org.apache.sqoop.io.CodecMap.LZOP; - - private CodecMap() { - } - - /** - * Given a codec name, return the name of the concrete class - * that implements it (or 'null' in the case of the "none" codec). - * @throws UnsupportedCodecException if a codec cannot be found - * with the supplied name. - */ - public static String getCodecClassName(String codecName) - throws UnsupportedCodecException { - return org.apache.sqoop.io.CodecMap.getCodecClassName(codecName); - } - - /** - * Given a codec name, instantiate the concrete implementation - * class that implements it. - * @throws UnsupportedCodecException if a codec cannot be found - * with the supplied name. - */ - public static CompressionCodec getCodec(String codecName, - Configuration conf) throws UnsupportedCodecException { - return org.apache.sqoop.io.CodecMap.getCodec(codecName, conf); - } - - /** - * Return the set of available codec names. - */ - public static Set<String> getCodecNames() { - return org.apache.sqoop.io.CodecMap.getCodecNames(); - } - - /** - * Return the short name of the codec. - * See {@link org.apache.sqoop.io.CodecMap#getCodecShortNameByName(String, - * Configuration)}. - */ - public static String getCodecShortNameByName(String codecName, - Configuration conf) throws UnsupportedCodecException { - return org.apache.sqoop.io.CodecMap - .getCodecShortNameByName(codecName, conf); - } -} http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/io/FixedLengthInputStream.java ---------------------------------------------------------------------- diff --git a/src/java/com/cloudera/sqoop/io/FixedLengthInputStream.java b/src/java/com/cloudera/sqoop/io/FixedLengthInputStream.java deleted file mode 100644 index 806af22..0000000 --- a/src/java/com/cloudera/sqoop/io/FixedLengthInputStream.java +++ /dev/null @@ -1,38 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.cloudera.sqoop.io; - -import java.io.InputStream; - -/** - * Provides an InputStream that can consume a fixed maximum number of bytes - * from an underlying stream. Closing the FixedLengthInputStream does not - * close the underlying stream. After reading the maximum number of available - * bytes this acts as though EOF has been reached. - * - * @deprecated use org.apache.sqoop.io.FixedLengthInputStream instead. - * @see org.apache.sqoop.io.FixedLengthInputStream - */ -public class FixedLengthInputStream - extends org.apache.sqoop.io.FixedLengthInputStream { - - public FixedLengthInputStream(InputStream stream, long maxLen) { - super(stream, maxLen); - } -} -
