Repository: sqoop Updated Branches: refs/heads/SQOOP-1367 88eb766e5 -> a41ce9e51
http://git-wip-us.apache.org/repos/asf/sqoop/blob/a41ce9e5/spi/src/main/java/org/apache/sqoop/connector/spi/SqoopConnector.java ---------------------------------------------------------------------- diff --git a/spi/src/main/java/org/apache/sqoop/connector/spi/SqoopConnector.java b/spi/src/main/java/org/apache/sqoop/connector/spi/SqoopConnector.java index 7081b4c..2112bf7 100644 --- a/spi/src/main/java/org/apache/sqoop/connector/spi/SqoopConnector.java +++ b/spi/src/main/java/org/apache/sqoop/connector/spi/SqoopConnector.java @@ -20,7 +20,7 @@ package org.apache.sqoop.connector.spi; import java.util.Locale; import java.util.ResourceBundle; -import org.apache.sqoop.common.ConnectorType; +import org.apache.sqoop.common.Direction; import org.apache.sqoop.connector.idf.CSVIntermediateDataFormat; import org.apache.sqoop.connector.idf.IntermediateDataFormat; import org.apache.sqoop.job.etl.From; @@ -53,7 +53,7 @@ public abstract class SqoopConnector { /** * @return Get job configuration class for given type or null if not supported */ - public abstract Class getJobConfigurationClass(ConnectorType jobType); + public abstract Class getJobConfigurationClass(Direction jobType); /** * @return an <tt>From</tt> that provides classes for performing import. http://git-wip-us.apache.org/repos/asf/sqoop/blob/a41ce9e5/submission/mapreduce/src/main/java/org/apache/sqoop/submission/mapreduce/MapreduceSubmissionEngine.java ---------------------------------------------------------------------- diff --git a/submission/mapreduce/src/main/java/org/apache/sqoop/submission/mapreduce/MapreduceSubmissionEngine.java b/submission/mapreduce/src/main/java/org/apache/sqoop/submission/mapreduce/MapreduceSubmissionEngine.java index bdb6390..bfa6958 100644 --- a/submission/mapreduce/src/main/java/org/apache/sqoop/submission/mapreduce/MapreduceSubmissionEngine.java +++ b/submission/mapreduce/src/main/java/org/apache/sqoop/submission/mapreduce/MapreduceSubmissionEngine.java @@ -26,7 +26,7 @@ import org.apache.hadoop.mapred.JobStatus; import org.apache.hadoop.mapred.RunningJob; import org.apache.hadoop.mapreduce.Job; import org.apache.log4j.Logger; -import org.apache.sqoop.common.ConnectorType; +import org.apache.sqoop.common.Direction; import org.apache.sqoop.common.MapContext; import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.execution.mapreduce.MRSubmissionRequest; @@ -164,7 +164,7 @@ public class MapreduceSubmissionEngine extends SubmissionEngine { } // Serialize connector context as a sub namespace - for(Map.Entry<String, String> entry : request.getConnectorContext(ConnectorType.FROM)) { + for(Map.Entry<String, String> entry : request.getConnectorContext(Direction.FROM)) { if (entry.getValue() == null) { LOG.warn("Ignoring null connector context value for key " + entry.getKey()); continue; @@ -174,7 +174,7 @@ public class MapreduceSubmissionEngine extends SubmissionEngine { entry.getValue()); } - for(Map.Entry<String, String> entry : request.getConnectorContext(ConnectorType.TO)) { + for(Map.Entry<String, String> entry : request.getConnectorContext(Direction.TO)) { if (entry.getValue() == null) { LOG.warn("Ignoring null connector context value for key " + entry.getKey()); continue; @@ -200,15 +200,15 @@ public class MapreduceSubmissionEngine extends SubmissionEngine { Job job = new Job(configuration); // And finally put all configuration objects to credentials cache - ConfigurationUtils.setConnectorConnectionConfig(ConnectorType.FROM, job, request.getConnectorConnectionConfig(ConnectorType.FROM)); - ConfigurationUtils.setConnectorJobConfig(ConnectorType.FROM, job, request.getConnectorJobConfig(ConnectorType.FROM)); - ConfigurationUtils.setConnectorConnectionConfig(ConnectorType.TO, job, request.getConnectorConnectionConfig(ConnectorType.TO)); - ConfigurationUtils.setConnectorJobConfig(ConnectorType.TO, job, request.getConnectorJobConfig(ConnectorType.TO)); - ConfigurationUtils.setFrameworkConnectionConfig(ConnectorType.FROM, job, request.getFrameworkConnectionConfig(ConnectorType.FROM)); - ConfigurationUtils.setFrameworkConnectionConfig(ConnectorType.TO, job, request.getFrameworkConnectionConfig(ConnectorType.TO)); + ConfigurationUtils.setConnectorConnectionConfig(Direction.FROM, job, request.getConnectorConnectionConfig(Direction.FROM)); + ConfigurationUtils.setConnectorJobConfig(Direction.FROM, job, request.getConnectorJobConfig(Direction.FROM)); + ConfigurationUtils.setConnectorConnectionConfig(Direction.TO, job, request.getConnectorConnectionConfig(Direction.TO)); + ConfigurationUtils.setConnectorJobConfig(Direction.TO, job, request.getConnectorJobConfig(Direction.TO)); + ConfigurationUtils.setFrameworkConnectionConfig(Direction.FROM, job, request.getFrameworkConnectionConfig(Direction.FROM)); + ConfigurationUtils.setFrameworkConnectionConfig(Direction.TO, job, request.getFrameworkConnectionConfig(Direction.TO)); ConfigurationUtils.setFrameworkJobConfig(job, request.getConfigFrameworkJob()); // @TODO(Abe): Persist TO schema. - ConfigurationUtils.setConnectorSchema(ConnectorType.FROM, job, request.getSummary().getConnectorSchema()); + ConfigurationUtils.setConnectorSchema(Direction.FROM, job, request.getSummary().getConnectorSchema()); if(request.getJobName() != null) { job.setJobName("Sqoop: " + request.getJobName());
