From b8fd60202865fa5c58c61361c45496e01bf05456 Mon Sep 17 00:00:00 2001 From: Jarek Jarcec Cecho Date: Tue, 9 Jul 2013 19:45:32 -0700 Subject: [PATCH] SQOOP-1118: Move PostgreSQL specific MR codes to org.apache.sqoop.mapreduce.posgresql (Masatake Iwasaki via Jarek Jarcec Cecho) --- src/java/org/apache/sqoop/manager/PGBulkloadManager.java | 2 +- .../sqoop/mapreduce/{ => postgresql}/PGBulkloadExportJob.java | 3 ++- .../mapreduce/{ => postgresql}/PGBulkloadExportMapper.java | 3 ++- .../mapreduce/{ => postgresql}/PGBulkloadExportReducer.java | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) rename src/java/org/apache/sqoop/mapreduce/{ => postgresql}/PGBulkloadExportJob.java (98%) rename src/java/org/apache/sqoop/mapreduce/{ => postgresql}/PGBulkloadExportMapper.java (99%) rename src/java/org/apache/sqoop/mapreduce/{ => postgresql}/PGBulkloadExportReducer.java (97%) diff --git a/src/java/org/apache/sqoop/manager/PGBulkloadManager.java b/src/java/org/apache/sqoop/manager/PGBulkloadManager.java index 091fd15b..04e1443b 100644 --- a/src/java/org/apache/sqoop/manager/PGBulkloadManager.java +++ b/src/java/org/apache/sqoop/manager/PGBulkloadManager.java @@ -26,7 +26,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.sqoop.mapreduce.ExportInputFormat; -import org.apache.sqoop.mapreduce.PGBulkloadExportJob; +import org.apache.sqoop.mapreduce.postgresql.PGBulkloadExportJob; diff --git a/src/java/org/apache/sqoop/mapreduce/PGBulkloadExportJob.java b/src/java/org/apache/sqoop/mapreduce/postgresql/PGBulkloadExportJob.java similarity index 98% rename from src/java/org/apache/sqoop/mapreduce/PGBulkloadExportJob.java rename to src/java/org/apache/sqoop/mapreduce/postgresql/PGBulkloadExportJob.java index cc602338..79fb7da1 100644 --- a/src/java/org/apache/sqoop/mapreduce/PGBulkloadExportJob.java +++ b/src/java/org/apache/sqoop/mapreduce/postgresql/PGBulkloadExportJob.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.sqoop.mapreduce; +package org.apache.sqoop.mapreduce.postgresql; import java.io.IOException; import com.cloudera.sqoop.manager.ExportJobContext; @@ -35,6 +35,7 @@ import org.apache.sqoop.config.ConfigurationHelper; import org.apache.sqoop.lib.DelimiterSet; import org.apache.sqoop.manager.ConnManager; +import org.apache.sqoop.mapreduce.ExportJobBase; import org.apache.sqoop.mapreduce.db.DBConfiguration; import org.apache.sqoop.orm.TableClassName; diff --git a/src/java/org/apache/sqoop/mapreduce/PGBulkloadExportMapper.java b/src/java/org/apache/sqoop/mapreduce/postgresql/PGBulkloadExportMapper.java similarity index 99% rename from src/java/org/apache/sqoop/mapreduce/PGBulkloadExportMapper.java rename to src/java/org/apache/sqoop/mapreduce/postgresql/PGBulkloadExportMapper.java index 81b1333e..333546f1 100644 --- a/src/java/org/apache/sqoop/mapreduce/PGBulkloadExportMapper.java +++ b/src/java/org/apache/sqoop/mapreduce/postgresql/PGBulkloadExportMapper.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.sqoop.mapreduce; +package org.apache.sqoop.mapreduce.postgresql; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -37,6 +37,7 @@ import org.apache.hadoop.io.Writable; import org.apache.sqoop.lib.SqoopRecord; import org.apache.hadoop.mapreduce.Mapper.Context; +import org.apache.sqoop.mapreduce.AutoProgressMapper; import org.apache.sqoop.mapreduce.db.DBConfiguration; import org.apache.sqoop.util.LoggingUtils; import org.apache.sqoop.util.PostgreSQLUtils; diff --git a/src/java/org/apache/sqoop/mapreduce/PGBulkloadExportReducer.java b/src/java/org/apache/sqoop/mapreduce/postgresql/PGBulkloadExportReducer.java similarity index 97% rename from src/java/org/apache/sqoop/mapreduce/PGBulkloadExportReducer.java rename to src/java/org/apache/sqoop/mapreduce/postgresql/PGBulkloadExportReducer.java index 6f558616..3dc05a7a 100644 --- a/src/java/org/apache/sqoop/mapreduce/PGBulkloadExportReducer.java +++ b/src/java/org/apache/sqoop/mapreduce/postgresql/PGBulkloadExportReducer.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.sqoop.mapreduce; +package org.apache.sqoop.mapreduce.postgresql; import java.io.IOException; import java.sql.Connection; @@ -28,6 +28,7 @@ import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.io.Text; +import org.apache.sqoop.mapreduce.AutoProgressReducer; import org.apache.sqoop.mapreduce.db.DBConfiguration; import org.apache.sqoop.util.LoggingUtils;