Author: reschke
Date: Wed Sep 27 16:45:02 2017
New Revision: 1809887
URL: http://svn.apache.org/viewvc?rev=1809887&view=rev
Log:
OAK-6237: Tomcat JDBC pool's StatementCache interceptor may cache borked
PreparedStatements with DB2 (ported to 1.6)
Avoid the use of PreparedStatements for checking table existence
Modified:
jackrabbit/oak/branches/1.6/oak-core/ (props changed)
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Propchange: jackrabbit/oak/branches/1.6/oak-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Sep 27 16:45:02 2017
@@ -0,0 +1,4 @@
+/jackrabbit/oak/branches/1.0/oak-core:1665962
+/jackrabbit/oak/trunk/oak-core:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1790382,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1798035,1798834,1799219,1799389,1799393,1799924,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1805851-1805852,180666
8,1807308,1807688,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256
+/jackrabbit/oak/trunk/oak-store-document:1809866
+/jackrabbit/trunk/oak-core:1345480
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java?rev=1809887&r1=1809886&r2=1809887&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
Wed Sep 27 16:45:02 2017
@@ -182,11 +182,11 @@ public class RDBBlobStore extends Cachin
try {
for (String tableName : new String[] { this.tnData, this.tnMeta })
{
- PreparedStatement checkStatement = null;
+ Statement checkStatement = null;
try {
- checkStatement = con.prepareStatement("select ID from " +
tableName + " where ID = ?");
- checkStatement.setString(1, "0");
- checkStatement.executeQuery().close();
+ // avoid PreparedStatement due to weird DB2 behavior
(OAK-6237)
+ checkStatement = con.createStatement();
+ checkStatement.executeQuery("select ID from " + tableName
+ " where ID = '0'").close();
checkStatement.close();
checkStatement = null;
con.commit();
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1809887&r1=1809886&r2=1809887&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Wed Sep 27 16:45:02 2017
@@ -1006,14 +1006,14 @@ public class RDBDocumentStore implements
}
String tableName = tmd.getName();
- PreparedStatement checkStatement = null;
+ Statement checkStatement = null;
ResultSet checkResultSet = null;
Statement creatStatement = null;
try {
- checkStatement = con.prepareStatement("select * from " + tableName
+ " where ID = ?");
- checkStatement.setString(1, "0:/");
- checkResultSet = checkStatement.executeQuery();
+ // avoid PreparedStatement due to weird DB2 behavior (OAK-6237)
+ checkStatement = con.createStatement();
+ checkResultSet = checkStatement.executeQuery("select * from " +
tableName + " where ID = '0'");
// try to discover size of DATA column and binary-ness of ID
ResultSetMetaData met = checkResultSet.getMetaData();
