Repository: sqoop Updated Branches: refs/heads/sqoop2 fde0eb177 -> 320bf6040
SQOOP-1605: Sqoop2: Misc From/to cleanups (Abraham Elmahrek via Jarek Jarcec Cecho) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/320bf604 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/320bf604 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/320bf604 Branch: refs/heads/sqoop2 Commit: 320bf604062a7baab5f8c4995b3f718b4b9bf8c3 Parents: fde0eb1 Author: Jarek Jarcec Cecho <[email protected]> Authored: Mon Oct 27 12:50:12 2014 -0700 Committer: Jarek Jarcec Cecho <[email protected]> Committed: Mon Oct 27 12:50:12 2014 -0700 ---------------------------------------------------------------------- .../org/apache/sqoop/driver/JobManager.java | 2 -- .../sqoop/repository/TestJdbcRepository.java | 1 - .../apache/sqoop/handler/JobRequestHandler.java | 28 +++++++++++++------- .../apache/sqoop/shell/CreateJobFunction.java | 1 - .../mapreduce/MapreduceSubmissionEngine.java | 1 - 5 files changed, 19 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/320bf604/core/src/main/java/org/apache/sqoop/driver/JobManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/sqoop/driver/JobManager.java b/core/src/main/java/org/apache/sqoop/driver/JobManager.java index e83002d..f6447c6 100644 --- a/core/src/main/java/org/apache/sqoop/driver/JobManager.java +++ b/core/src/main/java/org/apache/sqoop/driver/JobManager.java @@ -283,7 +283,6 @@ public class JobManager implements Reconfigurable { if (lastSubmission != null && lastSubmission.getStatus().isRunning()) { throw new SqoopException(DriverError.DRIVER_0002, "Job with id " + jobId); } - // TODO(Abe): Call multiple destroyers. // TODO(jarcec): We might need to catch all exceptions here to ensure // that Destroyer will be executed in all cases. // NOTE: the following is a blocking call @@ -514,7 +513,6 @@ public class JobManager implements Reconfigurable { "Can't create toDestroyer instance: " + toDestroyerClass.getName()); } - // TODO(Abe): Update context to manage multiple connectors. As well as summary. DestroyerContext fromDestroyerContext = new DestroyerContext( request.getConnectorContext(Direction.FROM), false, request.getSummary() .getFromSchema()); http://git-wip-us.apache.org/repos/asf/sqoop/blob/320bf604/core/src/test/java/org/apache/sqoop/repository/TestJdbcRepository.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/sqoop/repository/TestJdbcRepository.java b/core/src/test/java/org/apache/sqoop/repository/TestJdbcRepository.java index ae0e922..e11fd10 100644 --- a/core/src/test/java/org/apache/sqoop/repository/TestJdbcRepository.java +++ b/core/src/test/java/org/apache/sqoop/repository/TestJdbcRepository.java @@ -273,7 +273,6 @@ public class TestJdbcRepository { upgraderOrder.verify(connectorUpgraderMock, times(1)).upgradeToJobConfig(any(MToConfig.class), any(MToConfig.class)); upgraderOrder.verifyNoMoreInteractions(); validatorOrder.verify(validatorMock, times(2)).validateConfigForLink(anyObject()); - // @TODO(Abe): Re-enable job validation? validatorOrder.verify(validatorMock, times(0)).validateConfigForJob(anyObject()); validatorOrder.verifyNoMoreInteractions(); } http://git-wip-us.apache.org/repos/asf/sqoop/blob/320bf604/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java index 21ff376..61b1610 100644 --- a/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java +++ b/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java @@ -255,23 +255,33 @@ public class JobRequestHandler implements RequestHandler { bean = new JobBean(jobs); // Add associated resources into the bean - // @TODO(Abe): From/To. for( MJob job : jobs) { - long connectorId = job.getConnectorId(Direction.FROM); - if(!bean.hasConnectorConfigBundle(connectorId)) { - bean.addConnectorConfigBundle(connectorId, - ConnectorManager.getInstance().getResourceBundle(connectorId, locale)); + long fromConnectorId = job.getConnectorId(Direction.FROM); + long toConnectorId = job.getConnectorId(Direction.TO); + if(!bean.hasConnectorConfigBundle(fromConnectorId)) { + bean.addConnectorConfigBundle(fromConnectorId, + ConnectorManager.getInstance().getResourceBundle(fromConnectorId, locale)); + } + if(!bean.hasConnectorConfigBundle(toConnectorId)) { + bean.addConnectorConfigBundle(toConnectorId, + ConnectorManager.getInstance().getResourceBundle(toConnectorId, locale)); } } } else { long jid = Long.valueOf(sjid); MJob job = repository.findJob(jid); - // @TODO(Abe): From/To - long connectorId = job.getConnectorId(Direction.FROM); + long fromConnectorId = job.getConnectorId(Direction.FROM); + long toConnectorId = job.getConnectorId(Direction.TO); bean = new JobBean(job); - bean.addConnectorConfigBundle(connectorId, - ConnectorManager.getInstance().getResourceBundle(connectorId, locale)); + if(!bean.hasConnectorConfigBundle(fromConnectorId)) { + bean.addConnectorConfigBundle(fromConnectorId, + ConnectorManager.getInstance().getResourceBundle(fromConnectorId, locale)); + } + if(!bean.hasConnectorConfigBundle(toConnectorId)) { + bean.addConnectorConfigBundle(toConnectorId, + ConnectorManager.getInstance().getResourceBundle(toConnectorId, locale)); + } } // set driver config bundle http://git-wip-us.apache.org/repos/asf/sqoop/blob/320bf604/shell/src/main/java/org/apache/sqoop/shell/CreateJobFunction.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/sqoop/shell/CreateJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/CreateJobFunction.java index 0d3d2b5..6f136b2 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/CreateJobFunction.java +++ b/shell/src/main/java/org/apache/sqoop/shell/CreateJobFunction.java @@ -73,7 +73,6 @@ public class CreateJobFunction extends SqoopFunction { ConsoleReader reader = new ConsoleReader(); MJob job = client.createJob(fromLinkId, toLinkId); - // @TODO(Abe): From/To. ResourceBundle fromConfigBundle = client.getConnectorConfigBundle( job.getConnectorId(Direction.FROM)); ResourceBundle toConfigBundle = client.getConnectorConfigBundle( http://git-wip-us.apache.org/repos/asf/sqoop/blob/320bf604/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 646e8cb..631ceca 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 @@ -210,7 +210,6 @@ public class MapreduceSubmissionEngine extends SubmissionEngine { MRConfigurationUtils.setConnectorJobConfig(Direction.TO, job, request.getJobConfig(Direction.TO)); MRConfigurationUtils.setDriverConfig(job, request.getDriverConfig()); - // @TODO(Abe): Persist TO schema. MRConfigurationUtils.setConnectorSchema(Direction.FROM, job, request.getSummary().getFromSchema()); MRConfigurationUtils.setConnectorSchema(Direction.TO, job, request.getSummary().getToSchema());
