Repository: sqoop Updated Branches: refs/heads/sqoop2 cc61ed534 -> 3a0c46fd6
SQOOP-2034: Sqoop2: Clean up docstring and names in repository API (Veena Basavaraj via Abraham Elmahrek) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/3a0c46fd Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/3a0c46fd Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/3a0c46fd Branch: refs/heads/sqoop2 Commit: 3a0c46fd66805aa2430438d0f2a3d8e31991a33d Parents: cc61ed5 Author: Abraham Elmahrek <[email protected]> Authored: Thu Jan 22 11:08:00 2015 -0800 Committer: Abraham Elmahrek <[email protected]> Committed: Thu Jan 22 11:08:00 2015 -0800 ---------------------------------------------------------------------- .../org/apache/sqoop/connector/kafka/KafkaConnector.java | 2 +- .../org/apache/sqoop/connector/spi/SqoopConnector.java | 2 +- .../java/org/apache/sqoop/repository/JdbcRepository.java | 2 +- .../apache/sqoop/repository/JdbcRepositoryHandler.java | 8 ++++---- .../main/java/org/apache/sqoop/repository/Repository.java | 10 +++++----- .../org/apache/sqoop/repository/RepositoryManager.java | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/3a0c46fd/connector/connector-kafka/src/main/java/org/apache/sqoop/connector/kafka/KafkaConnector.java ---------------------------------------------------------------------- diff --git a/connector/connector-kafka/src/main/java/org/apache/sqoop/connector/kafka/KafkaConnector.java b/connector/connector-kafka/src/main/java/org/apache/sqoop/connector/kafka/KafkaConnector.java index 84b4be8..e3eafe8 100644 --- a/connector/connector-kafka/src/main/java/org/apache/sqoop/connector/kafka/KafkaConnector.java +++ b/connector/connector-kafka/src/main/java/org/apache/sqoop/connector/kafka/KafkaConnector.java @@ -104,7 +104,7 @@ public class KafkaConnector extends SqoopConnector { * Returns an {@linkplain org.apache.sqoop.connector.spi.ConnectorConfigurableUpgrader} object that can upgrade the * configs related to the link and job * - * @return RespositoryUpgrader object + * @return ConnectorConfigurableUpgrader object */ @Override public ConnectorConfigurableUpgrader getConfigurableUpgrader() { http://git-wip-us.apache.org/repos/asf/sqoop/blob/3a0c46fd/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/spi/SqoopConnector.java ---------------------------------------------------------------------- diff --git a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/spi/SqoopConnector.java b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/spi/SqoopConnector.java index ff8bb22..bfd5f23 100644 --- a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/spi/SqoopConnector.java +++ b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/spi/SqoopConnector.java @@ -85,7 +85,7 @@ public abstract class SqoopConnector { /** * Returns an {@linkplain ConnectorConfigurableUpgrader} object that can upgrade the * configs related to the link and job - * @return RespositoryUpgrader object + * @return ConnectorConfigurableUpgrader object */ public abstract ConnectorConfigurableUpgrader getConfigurableUpgrader(); http://git-wip-us.apache.org/repos/asf/sqoop/blob/3a0c46fd/core/src/main/java/org/apache/sqoop/repository/JdbcRepository.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/sqoop/repository/JdbcRepository.java b/core/src/main/java/org/apache/sqoop/repository/JdbcRepository.java index e163622..091c3ca 100644 --- a/core/src/main/java/org/apache/sqoop/repository/JdbcRepository.java +++ b/core/src/main/java/org/apache/sqoop/repository/JdbcRepository.java @@ -138,7 +138,7 @@ public class JdbcRepository extends Repository { * {@inheritDoc} */ @Override - public boolean isRespositorySuitableForUse() { + public boolean isRepositorySuitableForUse() { return (Boolean) doWithConnection(new DoWithConnection() { @Override public Object doIt(Connection conn) throws Exception { http://git-wip-us.apache.org/repos/asf/sqoop/blob/3a0c46fd/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryHandler.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryHandler.java b/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryHandler.java index 5642081..f4b1374 100644 --- a/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryHandler.java +++ b/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryHandler.java @@ -99,7 +99,7 @@ public abstract class JdbcRepositoryHandler { * @param conn JDBC link for querying repository */ - public abstract void upgradeConnectorAndConfigs(MConnector mConnector, Connection conn); + protected abstract void upgradeConnectorAndConfigs(MConnector mConnector, Connection conn); /** * Upgrade the driver with the new data supplied in the @@ -114,7 +114,7 @@ public abstract class JdbcRepositoryHandler { * the driverConfig. * @param conn JDBC link for querying repository */ - public abstract void upgradeDriverAndConfigs(MDriver mDriver, Connection conn); + protected abstract void upgradeDriverAndConfigs(MDriver mDriver, Connection conn); /** * Search for driver in the repository. @@ -235,7 +235,7 @@ public abstract class JdbcRepositoryHandler { * @param linkId Link object whose inputs should be removed from repository * @param conn Connection to the repository */ - public abstract void deleteLinkInputs(long linkId, Connection conn); + protected abstract void deleteLinkInputs(long linkId, Connection conn); /** * Find link with given id in repository. @@ -316,7 +316,7 @@ public abstract class JdbcRepositoryHandler { * @param id Job object whose inputs should be removed from repository * @param conn Connection to the repository */ - public abstract void deleteJobInputs(long id, Connection conn); + protected abstract void deleteJobInputs(long id, Connection conn); /** * Delete job with given id from the repository. This method will * delete all inputs for this job also. http://git-wip-us.apache.org/repos/asf/sqoop/blob/3a0c46fd/core/src/main/java/org/apache/sqoop/repository/Repository.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/sqoop/repository/Repository.java b/core/src/main/java/org/apache/sqoop/repository/Repository.java index 1e8350c..e07676a 100644 --- a/core/src/main/java/org/apache/sqoop/repository/Repository.java +++ b/core/src/main/java/org/apache/sqoop/repository/Repository.java @@ -77,7 +77,7 @@ public abstract class Repository { * * @return Boolean values if internal structures are suitable for use */ - public abstract boolean isRespositorySuitableForUse(); + public abstract boolean isRepositorySuitableForUse(); /** * Registers given connector in the repository and return registered @@ -382,7 +382,7 @@ public abstract class Repository { */ protected abstract void deleteLinkInputs(long linkId, RepositoryTransaction tx); - private void deletelinksAndJobs(List<MLink> links, List<MJob> jobs, RepositoryTransaction tx) { + private void deletelinksAndJobInputs(List<MLink> links, List<MJob> jobs, RepositoryTransaction tx) { for (MJob job : jobs) { deleteJobInputs(job.getPersistenceId(), tx); } @@ -391,7 +391,7 @@ public abstract class Repository { } } - private void deleteJobs(List<MJob> jobs, RepositoryTransaction tx) { + private void deleteJobInputsOnly(List<MJob> jobs, RepositoryTransaction tx) { for (MJob job : jobs) { deleteJobInputs(job.getPersistenceId(), tx); } @@ -432,7 +432,7 @@ public abstract class Repository { tx.begin(); // 4. Delete the inputs for all of the jobs and links (in that order) for // this connector - deletelinksAndJobs(existingLinksByConnector, existingJobsByConnector, tx); + deletelinksAndJobInputs(existingLinksByConnector, existingJobsByConnector, tx); // 5. Delete all inputs and configs associated with the connector, and // insert the new configs and inputs for this connector upgradeConnectorAndConfigs(newConnector, tx); @@ -563,7 +563,7 @@ public abstract class Repository { tx = getTransaction(); tx.begin(); //3. delete all jobs in the system - deleteJobs(existingJobs, tx); + deleteJobInputsOnly(existingJobs, tx); // 4. Delete all inputs and configs associated with the driver, and // insert the new configs and inputs for this driver upgradeDriverAndConfigs(driver, tx); http://git-wip-us.apache.org/repos/asf/sqoop/blob/3a0c46fd/core/src/main/java/org/apache/sqoop/repository/RepositoryManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/sqoop/repository/RepositoryManager.java b/core/src/main/java/org/apache/sqoop/repository/RepositoryManager.java index 6b481b8..121f388 100644 --- a/core/src/main/java/org/apache/sqoop/repository/RepositoryManager.java +++ b/core/src/main/java/org/apache/sqoop/repository/RepositoryManager.java @@ -125,7 +125,7 @@ public class RepositoryManager implements Reconfigurable { // NOTE: There are scenarios where a repository upgrade/ changes may happen outside of the // server bootup lifecyle. Hence always check/ verify for the repository sanity before marking the repo manager ready - if(!provider.getRepository().isRespositorySuitableForUse()) { + if(!provider.getRepository().isRepositorySuitableForUse()) { throw new SqoopException(RepositoryError.REPO_0002); }
