Author: reschke
Date: Mon Jun 15 15:18:38 2015
New Revision: 1685595
URL: http://svn.apache.org/r1685595
Log:
OAK-2410: RDBDocumentStore: properly close Statements and ResultSets in
getAdditionalDiagnostics() (ported to 1.2)
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 15 15:18:38 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679958,1679961,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680805-1680806,1680903,1681282,1681767,1681918,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684868,1685023,1685370,1685552
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679958,1679961,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680805-1680806,1680903,1681282,1681767,1681918,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684868,1685023,1685370,1685552,1685589
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1685595&r1=1685594&r2=1685595&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Mon Jun 15 15:18:38 2015
@@ -426,13 +426,15 @@ public class RDBDocumentStore implements
@Override
public String getAdditionalDiagnostics(RDBConnectionHandler ch,
String tableName) {
Connection con = null;
+ PreparedStatement stmt = null;
+ ResultSet rs = null;
Map<String, String> result = new HashMap<String, String>();
try {
con = ch.getROConnection();
String cat = con.getCatalog();
- PreparedStatement stmt = con.prepareStatement("SELECT
pg_encoding_to_char(encoding), datcollate FROM pg_database WHERE datname=?");
+ stmt = con.prepareStatement("SELECT
pg_encoding_to_char(encoding), datcollate FROM pg_database WHERE datname=?");
stmt.setString(1, cat);
- ResultSet rs = stmt.executeQuery();
+ rs = stmt.executeQuery();
while (rs.next()) {
result.put("pg_encoding_to_char(encoding)",
rs.getString(1));
result.put("datcollate", rs.getString(2));
@@ -442,6 +444,8 @@ public class RDBDocumentStore implements
} catch (SQLException ex) {
LOG.debug("while getting diagnostics", ex);
} finally {
+ ch.closeResultSet(rs);
+ ch.closeStatement(stmt);
ch.closeConnection(con);
}
return result.toString();
@@ -457,14 +461,16 @@ public class RDBDocumentStore implements
@Override
public String getAdditionalDiagnostics(RDBConnectionHandler ch,
String tableName) {
Connection con = null;
+ PreparedStatement stmt = null;
+ ResultSet rs = null;
Map<String, String> result = new HashMap<String, String>();
try {
con = ch.getROConnection();
// we can't look up by schema as con.getSchema is JDK 1.7
- PreparedStatement stmt = con.prepareStatement("SELECT
CODEPAGE, COLLATIONSCHEMA, COLLATIONNAME, TABSCHEMA FROM SYSCAT.COLUMNS WHERE
COLNAME=? and COLNO=0 AND UPPER(TABNAME)=UPPER(?)");
+ stmt = con.prepareStatement("SELECT CODEPAGE,
COLLATIONSCHEMA, COLLATIONNAME, TABSCHEMA FROM SYSCAT.COLUMNS WHERE COLNAME=?
and COLNO=0 AND UPPER(TABNAME)=UPPER(?)");
stmt.setString(1, "ID");
stmt.setString(2, tableName);
- ResultSet rs = stmt.executeQuery();
+ rs = stmt.executeQuery();
while (rs.next() && result.size() < 20) {
// thus including the schema name here
String schema = rs.getString("TABSCHEMA").trim();
@@ -477,6 +483,8 @@ public class RDBDocumentStore implements
} catch (SQLException ex) {
LOG.debug("while getting diagnostics", ex);
} finally {
+ ch.closeResultSet(rs);
+ ch.closeStatement(stmt);
ch.closeConnection(con);
}
return result.toString();
@@ -505,11 +513,13 @@ public class RDBDocumentStore implements
@Override
public String getAdditionalDiagnostics(RDBConnectionHandler ch,
String tableName) {
Connection con = null;
+ Statement stmt = null;
+ ResultSet rs = null;
Map<String, String> result = new HashMap<String, String>();
try {
con = ch.getROConnection();
- Statement stmt = con.createStatement();
- ResultSet rs = stmt.executeQuery("SELECT PARAMETER, VALUE
from NLS_DATABASE_PARAMETERS WHERE PARAMETER IN ('NLS_COMP',
'NLS_CHARACTERSET')");
+ stmt = con.createStatement();
+ rs = stmt.executeQuery("SELECT PARAMETER, VALUE from
NLS_DATABASE_PARAMETERS WHERE PARAMETER IN ('NLS_COMP', 'NLS_CHARACTERSET')");
while (rs.next()) {
result.put(rs.getString(1), rs.getString(2));
}
@@ -518,6 +528,8 @@ public class RDBDocumentStore implements
} catch (SQLException ex) {
LOG.debug("while getting diagnostics", ex);
} finally {
+ ch.closeResultSet(rs);
+ ch.closeStatement(stmt);
ch.closeConnection(con);
}
return result.toString();
@@ -555,12 +567,14 @@ public class RDBDocumentStore implements
@Override
public String getAdditionalDiagnostics(RDBConnectionHandler ch,
String tableName) {
Connection con = null;
+ PreparedStatement stmt = null;
+ ResultSet rs = null;
Map<String, String> result = new HashMap<String, String>();
try {
con = ch.getROConnection();
- PreparedStatement stmt = con.prepareStatement("SHOW TABLE
STATUS LIKE ?");
+ stmt = con.prepareStatement("SHOW TABLE STATUS LIKE ?");
stmt.setString(1, tableName);
- ResultSet rs = stmt.executeQuery();
+ rs = stmt.executeQuery();
while (rs.next()) {
result.put("collation", rs.getString("Collation"));
}
@@ -569,6 +583,8 @@ public class RDBDocumentStore implements
} catch (SQLException ex) {
LOG.debug("while getting diagnostics", ex);
} finally {
+ ch.closeResultSet(rs);
+ ch.closeStatement(stmt);
ch.closeConnection(con);
}
return result.toString();
@@ -612,13 +628,15 @@ public class RDBDocumentStore implements
@Override
public String getAdditionalDiagnostics(RDBConnectionHandler ch,
String tableName) {
Connection con = null;
+ PreparedStatement stmt = null;
+ ResultSet rs = null;
Map<String, String> result = new HashMap<String, String>();
try {
con = ch.getROConnection();
String cat = con.getCatalog();
- PreparedStatement stmt = con.prepareStatement("SELECT
collation_name FROM sys.databases WHERE name=?");
+ stmt = con.prepareStatement("SELECT collation_name FROM
sys.databases WHERE name=?");
stmt.setString(1, cat);
- ResultSet rs = stmt.executeQuery();
+ rs = stmt.executeQuery();
while (rs.next()) {
result.put("collation_name", rs.getString(1));
}
@@ -627,6 +645,8 @@ public class RDBDocumentStore implements
} catch (SQLException ex) {
LOG.debug("while getting diagnostics", ex);
} finally {
+ ch.closeResultSet(rs);
+ ch.closeStatement(stmt);
ch.closeConnection(con);
}
return result.toString();
