Updated Branches: refs/heads/sqoop2 6ceb22497 -> c4ddeb7ff
SQOOP-980: Sqoop2: Show connection and job command hung (Vasanth kumar RJ 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/c4ddeb7f Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/c4ddeb7f Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/c4ddeb7f Branch: refs/heads/sqoop2 Commit: c4ddeb7ff748d2fc837b67dd3eeea1375a98006a Parents: 6ceb224 Author: Jarek Jarcec Cecho <[email protected]> Authored: Sat Apr 13 15:03:52 2013 -0700 Committer: Jarek Jarcec Cecho <[email protected]> Committed: Sat Apr 13 15:03:52 2013 -0700 ---------------------------------------------------------------------- .../repository/derby/DerbyRepositoryHandler.java | 20 ++++++--------- 1 files changed, 8 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/c4ddeb7f/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java ---------------------------------------------------------------------- diff --git a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java index 486635d..32cef8a 100644 --- a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java +++ b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java @@ -1180,6 +1180,10 @@ public class DerbyRepositoryHandler implements JdbcRepositoryHandler { try { rsConnection = stmt.executeQuery(); + formConnectorFetchStmt = conn.prepareStatement(STMT_FETCH_FORM_CONNECTOR); + formFrameworkFetchStmt = conn.prepareStatement(STMT_FETCH_FORM_FRAMEWORK); + inputFetchStmt = conn.prepareStatement(STMT_FETCH_CONNECTION_INPUT); + while(rsConnection.next()) { long id = rsConnection.getLong(1); String name = rsConnection.getString(2); @@ -1187,14 +1191,8 @@ public class DerbyRepositoryHandler implements JdbcRepositoryHandler { Date creationDate = rsConnection.getTimestamp(4); Date lastUpdateDate = rsConnection.getTimestamp(5); - formConnectorFetchStmt = - conn.prepareStatement(STMT_FETCH_FORM_CONNECTOR); formConnectorFetchStmt.setLong(1, connectorId); - formFrameworkFetchStmt = - conn.prepareStatement(STMT_FETCH_FORM_FRAMEWORK); - - inputFetchStmt = conn.prepareStatement(STMT_FETCH_CONNECTION_INPUT); inputFetchStmt.setLong(1, id); //inputFetchStmt.setLong(2, XXX); // Will be filled by loadForms inputFetchStmt.setLong(3, id); @@ -1244,6 +1242,10 @@ public class DerbyRepositoryHandler implements JdbcRepositoryHandler { try { rsJob = stmt.executeQuery(); + formConnectorFetchStmt = conn.prepareStatement(STMT_FETCH_FORM_CONNECTOR); + formFrameworkFetchStmt = conn.prepareStatement(STMT_FETCH_FORM_FRAMEWORK); + inputFetchStmt = conn.prepareStatement(STMT_FETCH_JOB_INPUT); + while(rsJob.next()) { long connectorId = rsJob.getLong(1); long id = rsJob.getLong(2); @@ -1255,14 +1257,8 @@ public class DerbyRepositoryHandler implements JdbcRepositoryHandler { MJob.Type type = MJob.Type.valueOf(stringType); - formConnectorFetchStmt = - conn.prepareStatement(STMT_FETCH_FORM_CONNECTOR); formConnectorFetchStmt.setLong(1, connectorId); - formFrameworkFetchStmt = - conn.prepareStatement(STMT_FETCH_FORM_FRAMEWORK); - - inputFetchStmt = conn.prepareStatement(STMT_FETCH_JOB_INPUT); inputFetchStmt.setLong(1, id); //inputFetchStmt.setLong(1, XXX); // Will be filled by loadForms inputFetchStmt.setLong(3, id);
