github/sqoop
5
0
Fork 0
mirror of https://github.com/apache/sqoop.git synced 2025-05-09 18:32:09 +08:00
Code Issues Projects Releases Wiki Activity

SQOOP-2519: Sqoop2: Findbugs: Fix warning in repository-postgresql module

Browse Source 
(Colin Ma via Jarek Jarcec Cecho)
This commit is contained in:
Jarek Jarcec Cecho 2015-08-21 17:40:47 -07:00
parent cd8621a20c
commit 7aca9f4f6c
1 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
repository/repository-postgresql/src/main/java/org/apache/sqoop/repository/postgresql/PostgresqlRepositoryHandler.java
View File

@ -55,7 +55,6 @@ public String name() {
@Override
public synchronized void initialize(JdbcRepositoryContext ctx) {
repoContext = ctx;
repoContext.getDataSource();
LOG.info("PostgresqlRepositoryHandler initialized.");
}
@ -72,33 +71,30 @@ public synchronized void shutdown() {}
* @return
*/
public int detectRepositoryVersion(Connection conn) {
ResultSet rs = null, metadataResultSet = null;
PreparedStatement stmt = null;
// Select and return the version
try {
DatabaseMetaData md = conn.getMetaData();
metadataResultSet = md.getTables(null,
try (ResultSet metadataResultSet = md.getTables(null,
CommonRepositorySchemaConstants.SCHEMA_SQOOP,
CommonRepositorySchemaConstants.TABLE_SQ_SYSTEM_NAME, null);
CommonRepositorySchemaConstants.TABLE_SQ_SYSTEM_NAME, null)){
if (metadataResultSet.next()) {
stmt = conn.prepareStatement(PostgresqlSchemaQuery.STMT_SELECT_SYSTEM);
stmt.setString(1, CommonRepoConstants.SYSKEY_VERSION);
rs = stmt.executeQuery();
if (metadataResultSet.next()) {
try (PreparedStatement stmt = conn.prepareStatement(PostgresqlSchemaQuery.STMT_SELECT_SYSTEM)){
stmt.setString(1, CommonRepoConstants.SYSKEY_VERSION);
try (ResultSet rs = stmt.executeQuery()){
if (!rs.next()) {
return 0;
if (!rs.next()) {
return 0;
}
return rs.getInt(1);
}
}
}
return rs.getInt(1);
}
} catch (SQLException e) {
LOG.info("Can't fetch repository structure version.", e);
return 0;
} finally {
closeResultSets(rs);
closeStatements(stmt);
}
return 0;
@ -144,24 +140,16 @@ public void createOrUpgradeRepository(Connection conn) {
runQuery(PostgresqlSchemaCreateQuery.QUERY_CREATE_TABLE_SQ_CONTEXT, conn);
}
ResultSet rs = null;
PreparedStatement stmt = null;
try {
stmt = conn.prepareStatement(PostgresqlSchemaQuery.STMT_DELETE_SYSTEM);
stmt.setString(1, CommonRepoConstants.SYSKEY_VERSION);
stmt.executeUpdate();
try (PreparedStatement stmtDel = conn.prepareStatement(PostgresqlSchemaQuery.STMT_DELETE_SYSTEM);
PreparedStatement stmtInsert = conn.prepareStatement(PostgresqlSchemaQuery.STMT_INSERT_SYSTEM);) {
stmtDel.setString(1, CommonRepoConstants.SYSKEY_VERSION);
stmtDel.executeUpdate();
closeStatements(stmt);
stmt = conn.prepareStatement(PostgresqlSchemaQuery.STMT_INSERT_SYSTEM);
stmt.setString(1, CommonRepoConstants.SYSKEY_VERSION);
stmt.setString(2, Integer.toString(PostgresqlRepoConstants.LATEST_POSTGRESQL_REPOSITORY_VERSION));
stmt.executeUpdate();
stmtInsert.setString(1, CommonRepoConstants.SYSKEY_VERSION);
stmtInsert.setString(2, Integer.toString(PostgresqlRepoConstants.LATEST_POSTGRESQL_REPOSITORY_VERSION));
stmtInsert.executeUpdate();
} catch (SQLException e) {
LOG.error("Can't persist the repository version", e);
} finally {
closeResultSets(rs);
closeStatements(stmt);
}
}