Author: reschke
Date: Thu Jul 21 08:14:20 2016
New Revision: 1753646
URL: http://svn.apache.org/viewvc?rev=1753646&view=rev
Log:
OAK-4559: make sure all ResultSets get explicitly closed in order to address
Tomcat JDBC Pool issues with StatementCache interceptor
(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/RDBBlobStore.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreFriend.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStorePerformanceTest.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBPreparedStatementWrapper.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 08:14:20 2016
@@ -1,4 +1,4 @@
/jackrabbit/oak/branches/1.0:1665962
/jackrabbit/oak/branches/1.4:1745750,1747354,1750078,1750512
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672611,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,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,1678023,1678095-1678096,1678124,1678171,1678173,1678202,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682488,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561
,1684570,1684601,1684618,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685541,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686003,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686772,1686780,1686790,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690657,1690669,1690672,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691201,1691210,1691217-1691218,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691394,1691401,1691498,1691509,1692133-1692134,1692156,1692250,1692272,1692274,1692363,1692382,1692393,1692478,1692955,1693002,1693030,1693050,1693209,1693401,1693421,1693525-1693526,1694
007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695571,1695829-1695830,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697383,1697410,1697582,1697589,1697616,1697672,1697896,1698096,1698144,1700191,1700231,1700397,1700403,1700506,1700571,1700709,1700718,1700720,1700727,1700749,1700769,1700775,1701065,1701613,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701907,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702371,1702387,1702405,1702423,1702426,1702428,1702860,1702866,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1
706059,1706212,1706218,1706270,1706764,1706772,1707049,1707189,1707191,1707331,1707435,1707509,1707753,1708049,1708105,1708307,1708315,1708401,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1711248,1711282,1711296,1711405,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715092,1715191,1715346,1715716,1715767,1715771,1715888,1715898,1716100,1716178,1716426,1716576,1716588-1716589,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717203,1717277,1717393-1717394,1717410,1717462,1717632,1717768-1717769,1717784,1717789,1717988,1718528,1718533,1718547-1718548,1718626,1718646,1718772,1718801-1718802,171889
5,1719111,1719288,1719869,1720306,1720335,1720350,1720354,1720500,1721160,1721172,1721337,1722141,1722832,1723227,1723239,1723241,1723251,1723254,1723333,1723347,1723350,1723565,1723584,1723713,1723731,1724026,1724057,1724186,1724210,1724401,1724628,1724631,1725216,1725477,1725515,1725555,1725895,1725899,1725935,1725941,1725960,1726232,1726237,1726570,1726579,1726585-1726586,1726621,1726795,1726797,1726809,1726812,1726981,1726993,1727026,1727254,1727331,1727350,1727358,1727429,1727476,1727483,1727508,1727515-1727518,1727813,1727816,1727831-1727832,1727841,1727893,1727895,1727912-1727913,1727923,1727991,1728037,1728041,1728070,1728114,1728281,1728443,1728525,1728642,1729200,1729505,1729599,1729957,1729979,1730216,1730527,1730581,1730629,1730801,1731627,1731647-1731648,1731789,1731797,1732131,1732268,1732278,1732330,1732647-1732648,1732864,1733615,1733929,1734230,1734254,1735052,1735405,1735484,1735588,1736176,1737309-1737310,1737334,1737349,1738833,1738950,1738957,1739894,1740116,174
0626,1740971,1741032,1741339,1741343,1742520,1742888,1742916,1743097,1743172,1743343,1744265,1744959,1745038,1745197,1746117,1746696,1746981,1747341-1747342,1747492,1748505,1748553,1748722,1748870,1749350,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750076-1750077,1750287,1750457,1750465,1750495,1750626,1750809,1751410,1751478,1751755,1752273-1752274,1752438,1752508,1752659,1752672,1753444
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672611,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,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,1678023,1678095-1678096,1678124,1678171,1678173,1678202,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682488,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561
,1684570,1684601,1684618,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685541,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686003,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686772,1686780,1686790,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690657,1690669,1690672,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691201,1691210,1691217-1691218,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691394,1691401,1691498,1691509,1692133-1692134,1692156,1692250,1692272,1692274,1692363,1692382,1692393,1692478,1692955,1693002,1693030,1693050,1693209,1693401,1693421,1693525-1693526,1694
007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695571,1695829-1695830,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697383,1697410,1697582,1697589,1697616,1697672,1697896,1698096,1698144,1700191,1700231,1700397,1700403,1700506,1700571,1700709,1700718,1700720,1700727,1700749,1700769,1700775,1701065,1701613,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701907,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702371,1702387,1702405,1702423,1702426,1702428,1702860,1702866,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1
706059,1706212,1706218,1706270,1706764,1706772,1707049,1707189,1707191,1707331,1707435,1707509,1707753,1708049,1708105,1708307,1708315,1708401,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1711248,1711282,1711296,1711405,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715092,1715191,1715346,1715716,1715767,1715771,1715888,1715898,1716100,1716178,1716426,1716576,1716588-1716589,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717203,1717277,1717393-1717394,1717410,1717462,1717632,1717768-1717769,1717784,1717789,1717988,1718528,1718533,1718547-1718548,1718626,1718646,1718772,1718801-1718802,171889
5,1719111,1719288,1719869,1720306,1720335,1720350,1720354,1720500,1721160,1721172,1721337,1722141,1722832,1723227,1723239,1723241,1723251,1723254,1723333,1723347,1723350,1723565,1723584,1723713,1723731,1724026,1724057,1724186,1724210,1724401,1724628,1724631,1725216,1725477,1725515,1725555,1725895,1725899,1725935,1725941,1725960,1726232,1726237,1726570,1726579,1726585-1726586,1726621,1726795,1726797,1726809,1726812,1726981,1726993,1727026,1727254,1727331,1727350,1727358,1727429,1727476,1727483,1727508,1727515-1727518,1727813,1727816,1727831-1727832,1727841,1727893,1727895,1727912-1727913,1727923,1727991,1728037,1728041,1728070,1728114,1728281,1728443,1728525,1728642,1729200,1729505,1729599,1729957,1729979,1730216,1730527,1730581,1730629,1730801,1731627,1731647-1731648,1731789,1731797,1732131,1732268,1732278,1732330,1732647-1732648,1732864,1733615,1733929,1734230,1734254,1735052,1735405,1735484,1735588,1736176,1737309-1737310,1737334,1737349,1738833,1738950,1738957,1739894,1740116,174
0626,1740971,1741032,1741339,1741343,1742520,1742888,1742916,1743097,1743172,1743343,1744265,1744959,1745038,1745197,1746117,1746696,1746981,1747341-1747342,1747492,1748505,1748553,1748722,1748870,1749350,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750076-1750077,1750287,1750457,1750465,1750495,1750626,1750809,1751410,1751478,1751755,1752273-1752274,1752438,1752508,1752659,1752672,1753262,1753444
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java?rev=1753646&r1=1753645&r2=1753646&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
Thu Jul 21 08:14:20 2016
@@ -75,6 +75,7 @@ public class RDBBlobStore extends Cachin
@Override
public void close() {
+ String dropped = "";
if (!this.tablesToBeDropped.isEmpty()) {
LOG.debug("attempting to drop: " + this.tablesToBeDropped);
for (String tname : this.tablesToBeDropped) {
@@ -86,30 +87,28 @@ public class RDBBlobStore extends Cachin
stmt = con.createStatement();
stmt.execute("drop table " + tname);
stmt.close();
- stmt = null;
con.commit();
+ dropped += tname + " ";
} catch (SQLException ex) {
+ LOG.debug("attempting to drop: " + tname, ex);
+ } finally {
closeStatement(stmt);
- LOG.debug("attempting to drop: " + tname);
}
} catch (SQLException ex) {
- LOG.debug("attempting to drop: " + tname);
+ LOG.debug("attempting to drop: " + tname, ex);
} finally {
- try {
- if (con != null) {
- con.close();
- }
- } catch (SQLException ex) {
- LOG.debug("on close ", ex);
- }
+ this.ch.closeConnection(con);
}
}
+ dropped = dropped.trim();
}
try {
this.ch.close();
} catch (IOException ex) {
LOG.error("closing connection handler", ex);
}
+ LOG.info("RDBBlobStore (" + OakVersion.getVersion() + ") closed"
+ + (dropped.isEmpty() ? "" : " (tables dropped: " + dropped +
")"));
}
@Override
@@ -186,7 +185,7 @@ public class RDBBlobStore extends Cachin
try {
checkStatement = con.prepareStatement("select ID from " +
tableName + " where ID = ?");
checkStatement.setString(1, "0");
- checkStatement.executeQuery();
+ checkStatement.executeQuery().close();
checkStatement.close();
checkStatement = null;
con.commit();
@@ -288,15 +287,17 @@ public class RDBBlobStore extends Cachin
this.ch.rollbackConnection(con);
// the insert failed although it should have succeeded;
see whether the blob already exists
prep = con.prepareStatement("select DATA from " +
this.tnData + " where ID = ?");
+ ResultSet rs = null;
byte[] dbdata = null;
try {
prep.setString(1, id);
- ResultSet rs = prep.executeQuery();
+ rs = prep.executeQuery();
if (rs.next()) {
dbdata = rs.getBytes(1);
}
} finally {
- prep.close();
+ closeResultSet(rs);
+ closeStatement(prep);
}
if (dbdata == null) {
@@ -349,15 +350,17 @@ public class RDBBlobStore extends Cachin
try {
PreparedStatement prep = con.prepareStatement("select DATA from "
+ this.tnData + " where ID = ?");
+ ResultSet rs = null;
try {
prep.setString(1, id);
- ResultSet rs = prep.executeQuery();
+ rs = prep.executeQuery();
if (!rs.next()) {
throw new IOException("Datastore block " + id + " not
found");
}
data = rs.getBytes(1);
} finally {
- prep.close();
+ closeResultSet(rs);
+ closeStatement(prep);
}
} finally {
con.commit();
@@ -377,15 +380,17 @@ public class RDBBlobStore extends Cachin
try {
PreparedStatement prep = con.prepareStatement("select DATA
from " + this.tnData + " where ID = ?");
+ ResultSet rs = null;
try {
prep.setString(1, id);
- ResultSet rs = prep.executeQuery();
+ rs = prep.executeQuery();
if (!rs.next()) {
throw new IOException("Datastore block " + id + " not
found");
}
data = rs.getBytes(1);
} finally {
- prep.close();
+ closeResultSet(rs);
+ closeStatement(prep);
}
cache.put(id, data);
} finally {
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java?rev=1753646&r1=1753645&r2=1753646&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java
Thu Jul 21 08:14:20 2016
@@ -77,10 +77,9 @@ public class RDBDataSourceFactory {
dsclazz.getMethod("setUsername", String.class).invoke(ds,
username);
dsclazz.getMethod("setPassword", String.class).invoke(ds,
passwd);
dsclazz.getMethod("setUrl", String.class).invoke(ds, url);
- // SHOULD also contain StatementCache, but see OAK-4559
String interceptors = System.getProperty(
"org.apache.jackrabbit.oak.plugins.document.rdb.RDBDataSourceFactory.jdbcInterceptors",
- "SlowQueryReport(threshold=10000);ConnectionState");
+
"SlowQueryReport(threshold=10000);ConnectionState;StatementCache");
if (!interceptors.isEmpty()) {
dsclazz.getMethod("setJdbcInterceptors",
String.class).invoke(ds, interceptors);
}
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=1753646&r1=1753645&r2=1753646&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
Thu Jul 21 08:14:20 2016
@@ -784,7 +784,7 @@ public class RDBDocumentStore implements
}
String tableName = tmd.getName();
- PreparedStatement checkStatement = null, checkStatement2 = null;
+ PreparedStatement checkStatement = null;
ResultSet checkResultSet = null;
Statement creatStatement = null;
@@ -833,6 +833,9 @@ public class RDBDocumentStore implements
// table does not appear to exist
con.rollback();
+ PreparedStatement checkStatement2 = null;
+ ResultSet checkResultSet2 = null;
+
try {
creatStatement = con.createStatement();
creatStatement.execute(this.dbInfo.getTableCreationStatement(tableName));
@@ -850,9 +853,9 @@ public class RDBDocumentStore implements
checkStatement2 = con.prepareStatement("select * from " +
tableName + " where ID = ?");
checkStatement2.setString(1, "0:/");
- ResultSet rs = checkStatement2.executeQuery();
+ checkResultSet2 = checkStatement2.executeQuery();
// try to discover size of DATA column and binary-ness of ID
- ResultSetMetaData met = rs.getMetaData();
+ ResultSetMetaData met = checkResultSet2.getMetaData();
obtainFlagsFromResultSetMeta(met, tmd);
if (col == Collection.NODES) {
@@ -868,11 +871,14 @@ public class RDBDocumentStore implements
LOG.error("Failed to create table " + tableName + " in " +
dbname, ex2);
throw ex2;
}
+ finally {
+ closeResultSet(checkResultSet2);
+ closeStatement(checkStatement2);
+ }
}
finally {
closeResultSet(checkResultSet);
closeStatement(checkStatement);
- closeStatement(checkStatement2);
closeStatement(creatStatement);
}
}
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java?rev=1753646&r1=1753645&r2=1753646&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
Thu Jul 21 08:14:20 2016
@@ -106,7 +106,6 @@ public enum RDBDocumentStoreDB {
result.put("pg_encoding_to_char(encoding)",
rs.getString(1));
result.put("datcollate", rs.getString(2));
}
- stmt.close();
con.commit();
} catch (SQLException ex) {
LOG.debug("while getting diagnostics", ex);
@@ -302,6 +301,7 @@ public enum RDBDocumentStoreDB {
while (rs.next()) {
result.put(rs.getString(1), rs.getString(2));
}
+ rs.close();
stmt.close();
con.commit();
} catch (SQLException ex) {
@@ -372,6 +372,7 @@ public enum RDBDocumentStoreDB {
while (rs.next()) {
result.put("collation_name", rs.getString(1));
}
+ rs.close();
stmt.close();
con.commit();
} catch (SQLException ex) {
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreFriend.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreFriend.java?rev=1753646&r1=1753645&r2=1753646&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreFriend.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreFriend.java
Thu Jul 21 08:14:20 2016
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.document.rdb;
+import static
org.apache.jackrabbit.oak.plugins.document.rdb.RDBJDBCTools.closeResultSet;
import static
org.apache.jackrabbit.oak.plugins.document.rdb.RDBJDBCTools.closeStatement;
import java.io.IOException;
@@ -55,12 +56,14 @@ public class RDBBlobStoreFriend {
String id = StringUtils.convertBytesToHex(digest);
Connection con = ds.ch.getROConnection();
PreparedStatement prep = null;
+ ResultSet rs = null;
try {
prep = con.prepareStatement("select ID from " + ds.tnData + "
where ID = ?");
prep.setString(1, id);
- ResultSet rs = prep.executeQuery();
+ rs = prep.executeQuery();
return rs.next();
} finally {
+ closeResultSet(rs);
closeStatement(prep);
con.commit();
ds.ch.closeConnection(con);
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStorePerformanceTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStorePerformanceTest.java?rev=1753646&r1=1753645&r2=1753646&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStorePerformanceTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStorePerformanceTest.java
Thu Jul 21 08:14:20 2016
@@ -252,15 +252,17 @@ public class RDBDocumentStorePerformance
connection = super.rdbDataSource.getConnection();
connection.setAutoCommit(false);
PreparedStatement stmt = connection.prepareStatement("select
DATA, MODCOUNT from " + table + " where ID = ?");
+ ResultSet rs = null;
try {
setIdInStatement(stmt, 1, key);
- ResultSet rs = stmt.executeQuery();
+ rs = stmt.executeQuery();
assertTrue("test record " + key + " not found in " +
super.dsname, rs.next());
String got = rs.getString(1);
long modc = rs.getLong(2);
LOG.info("column reset " + modc + " times");
assertEquals(expect.toString(), got);
} finally {
+ rs = close(rs);
stmt = close(stmt);
}
} finally {
@@ -303,6 +305,17 @@ public class RDBDocumentStorePerformance
} catch (SQLException ex) {
// ignored
}
+ }
+ return null;
+ }
+
+ private static ResultSet close(ResultSet rs) {
+ if (rs != null) {
+ try {
+ rs.close();
+ } catch (SQLException ex) {
+ // ignored
+ }
}
return null;
}
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBPreparedStatementWrapper.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBPreparedStatementWrapper.java?rev=1753646&r1=1753645&r2=1753646&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBPreparedStatementWrapper.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBPreparedStatementWrapper.java
Thu Jul 21 08:14:20 2016
@@ -97,7 +97,7 @@ public class RDBPreparedStatementWrapper
((RDBResultSetWrapper) resultSet).dumpResult(null);
} else {
((RDBResultSetWrapper) resultSet).dumpResult("(not closed!)");
- LOG.error("Wrapped statement " + statement + " failed to close
associated ResultSet; call stack:",
+ LOG.error("Wrapped statement " + statement.getClass() + "
failed to close associated ResultSet; call stack:",
new Exception("call stack"));
}
}
