From c4ddeb7ff748d2fc837b67dd3eeea1375a98006a Mon Sep 17 00:00:00 2001 From: Jarek Jarcec Cecho Date: Sat, 13 Apr 2013 15:03:52 -0700 Subject: [PATCH] SQOOP-980: Sqoop2: Show connection and job command hung (Vasanth kumar RJ via Jarek Jarcec Cecho) --- .../derby/DerbyRepositoryHandler.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) 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 486635db..32cef8a1 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 @@ private List loadConnections(PreparedStatement stmt, 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 @@ private List loadConnections(PreparedStatement stmt, 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 @@ private List loadJobs(PreparedStatement stmt, 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 @@ private List loadJobs(PreparedStatement stmt, 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);