You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2016/01/05 09:39:01 UTC
svn commit: r1723019 - in /jackrabbit/oak/branches/1.2: ./
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/
Author: reschke
Date: Tue Jan 5 08:39:00 2016
New Revision: 1723019
URL: http://svn.apache.org/viewvc?rev=1723019&view=rev
Log:
OAK-1266: DataSourceWrapper for RDBDocumentStore tests that implements some logging and allows simulating certain driver-specific behaviors (ported to 1.2)
Added:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionWrapper.java
- copied, changed from r1684669, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionWrapper.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java
- copied, changed from r1684669, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBLogEntry.java
- copied unchanged from r1684669, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBLogEntry.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBPreparedStatementWrapper.java
- copied, changed from r1684669, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBPreparedStatementWrapper.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBResultSetWrapper.java
- copied, changed from r1684669, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBResultSetWrapper.java
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 5 08:39:00 2016
@@ -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,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,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,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618
,1684820,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,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,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693050,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695571,1695
905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700718,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702387,1702405,1702423,1702860,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,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707435,1707509,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1
711248,1711282,1711296,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,1715191,1715346,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717784,1717988,1718626,1718646,1718801,1718895,1719111,1719288,1720335,1720350,1720354,1720500,1721160,1721172,1722141,1722832
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,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,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,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,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686003,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,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,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693050,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695
521,1695540,1695571,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700718,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702387,1702405,1702423,1702860,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,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707435,1707509,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1
710811,1710816,1710972,1711248,1711282,1711296,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,1715191,1715346,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717784,1717789,1717988,1718626,1718646,1718801,1718895,1719111,1719288,1720335,1720350,1720354,1720500,1721160,1721172,1722141,1722832
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java?rev=1723019&r1=1723018&r2=1723019&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java Tue Jan 5 08:39:00 2016
@@ -25,6 +25,7 @@ import javax.sql.DataSource;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDataSourceFactory;
+import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDataSourceWrapper;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBOptions;
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
@@ -128,7 +129,7 @@ public abstract class DocumentStoreFixtu
public RDBFixture(String name, String url, String username, String passwd) {
this.name = name;
try {
- dataSource = RDBDataSourceFactory.forJdbcUrl(url, username, passwd);
+ dataSource = new RDBDataSourceWrapper(RDBDataSourceFactory.forJdbcUrl(url, username, passwd));
} catch (Exception ex) {
LOG.info("Database instance not available at " + url + ", skipping tests...", ex);
}
Copied: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionWrapper.java (from r1684669, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionWrapper.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionWrapper.java?p2=jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionWrapper.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionWrapper.java&r1=1684669&r2=1723019&rev=1723019&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionWrapper.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionWrapper.java Tue Jan 5 08:39:00 2016
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.document.rdb;
+import java.lang.reflect.InvocationTargetException;
import java.sql.Array;
import java.sql.Blob;
import java.sql.CallableStatement;
@@ -26,6 +27,7 @@ import java.sql.NClob;
import java.sql.PreparedStatement;
import java.sql.SQLClientInfoException;
import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
import java.sql.SQLWarning;
import java.sql.SQLXML;
import java.sql.Savepoint;
@@ -48,8 +50,10 @@ public class RDBConnectionWrapper implem
this.constart = System.nanoTime();
}
+ // needed in Java 7...
+ @SuppressWarnings("unused")
public void abort(Executor arg0) throws SQLException {
- connection.abort(arg0);
+ throw new SQLFeatureNotSupportedException();
}
public void clearWarnings() throws SQLException {
@@ -156,12 +160,28 @@ public class RDBConnectionWrapper implem
return connection.getMetaData();
}
+ // needed in Java 7...
+ @SuppressWarnings("unused")
public int getNetworkTimeout() throws SQLException {
- return connection.getNetworkTimeout();
+ throw new SQLFeatureNotSupportedException();
}
+ // needed in Java 7...
+ @SuppressWarnings("unused")
public String getSchema() throws SQLException {
- return connection.getSchema();
+ try {
+ return (String) connection.getClass().getMethod("getSchema").invoke(connection);
+ } catch (InvocationTargetException ex) {
+ if (ex.getCause() instanceof SQLException) {
+ throw (SQLException) ex.getCause();
+ } else {
+ // best effort otherwise
+ return null;
+ }
+ } catch (Throwable ex) {
+ // best effort otherwise
+ return null;
+ }
}
public int getTransactionIsolation() throws SQLException {
@@ -297,8 +317,10 @@ public class RDBConnectionWrapper implem
connection.setHoldability(arg0);
}
+ // needed in Java 7...
+ @SuppressWarnings("unused")
public void setNetworkTimeout(Executor arg0, int arg1) throws SQLException {
- connection.setNetworkTimeout(arg0, arg1);
+ throw new SQLFeatureNotSupportedException();
}
public void setReadOnly(boolean arg0) throws SQLException {
@@ -313,8 +335,10 @@ public class RDBConnectionWrapper implem
return connection.setSavepoint(arg0);
}
+ // needed in Java 7...
+ @SuppressWarnings("unused")
public void setSchema(String arg0) throws SQLException {
- connection.setSchema(arg0);
+ throw new SQLFeatureNotSupportedException();
}
public void setTransactionIsolation(int arg0) throws SQLException {
Copied: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java (from r1684669, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java?p2=jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java&r1=1684669&r2=1723019&rev=1723019&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java Tue Jan 5 08:39:00 2016
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.oak.plugins.document.rdb;
+import java.io.Closeable;
+import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
import java.sql.SQLException;
@@ -35,7 +37,7 @@ import javax.sql.DataSource;
* Note that the implementations currently focus on method invocations done
* by {@link RDBDocumentStore} and thus may not be applicable for other use cases.
*/
-public class RDBDataSourceWrapper implements DataSource {
+public class RDBDataSourceWrapper implements DataSource, Closeable {
// sample use in BasicDocumentStoreTest:
@@ -112,8 +114,10 @@ public class RDBDataSourceWrapper implem
return ds.getLoginTimeout();
}
+ // needed in Java 7...
+ @SuppressWarnings("unused")
public Logger getParentLogger() throws SQLFeatureNotSupportedException {
- return ds.getParentLogger();
+ throw new SQLFeatureNotSupportedException();
}
public boolean isWrapperFor(Class<?> iface) throws SQLException {
@@ -131,4 +135,11 @@ public class RDBDataSourceWrapper implem
public <T> T unwrap(Class<T> iface) throws SQLException {
return ds.unwrap(iface);
}
+
+ @Override
+ public void close() throws IOException {
+ if (ds instanceof Closeable) {
+ ((Closeable) ds).close();
+ }
+ }
}
Copied: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBPreparedStatementWrapper.java (from r1684669, jackrabbit/oak/trunk/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?p2=jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBPreparedStatementWrapper.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBPreparedStatementWrapper.java&r1=1684669&r2=1723019&rev=1723019&view=diff
==============================================================================
--- jackrabbit/oak/trunk/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 Tue Jan 5 08:39:00 2016
@@ -33,10 +33,13 @@ import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.RowId;
import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
import java.sql.SQLWarning;
import java.sql.SQLXML;
import java.sql.Time;
import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Calendar;
import java.util.List;
@@ -45,6 +48,7 @@ public class RDBPreparedStatementWrapper
private final RDBDataSourceWrapper datasource;
private final PreparedStatement statement;
private ResultSet resultSet = null;
+ private List<Object> parameters = new ArrayList<Object>();
public RDBPreparedStatementWrapper(RDBDataSourceWrapper datasource, PreparedStatement statement) {
this.datasource = datasource;
@@ -52,7 +56,13 @@ public class RDBPreparedStatementWrapper
}
public void addBatch() throws SQLException {
+ long start = System.nanoTime();
statement.addBatch();
+ List<RDBLogEntry> l = datasource.getLog();
+ if (l != null) {
+ l.add(new RDBLogEntry(start, "statement.addBatch() with parameters: " + parameters));
+ }
+ parameters.clear();
}
public void addBatch(String sql) throws SQLException {
@@ -69,6 +79,7 @@ public class RDBPreparedStatementWrapper
public void clearParameters() throws SQLException {
statement.clearParameters();
+ parameters.clear();
}
public void clearWarnings() throws SQLException {
@@ -82,8 +93,10 @@ public class RDBPreparedStatementWrapper
statement.close();
}
+ // needed in Java 7...
+ @SuppressWarnings("unused")
public void closeOnCompletion() throws SQLException {
- statement.closeOnCompletion();
+ throw new SQLFeatureNotSupportedException();
}
public boolean execute() throws SQLException {
@@ -107,7 +120,25 @@ public class RDBPreparedStatementWrapper
}
public int[] executeBatch() throws SQLException {
- return statement.executeBatch();
+ long start = System.nanoTime();
+ int results[] = {};
+ SQLException x = null;
+ try {
+ results = statement.executeBatch();
+ return results;
+ } catch (SQLException ex) {
+ x = ex;
+ throw ex;
+ } finally {
+ List<RDBLogEntry> l = datasource.getLog();
+ if (l != null) {
+ String message = "statement.executeBatch() -> " + Arrays.toString(results);
+ if (x != null) {
+ message += " -> " + x.getMessage();
+ }
+ l.add(new RDBLogEntry(start, message));
+ }
+ }
}
public ResultSet executeQuery() throws SQLException {
@@ -122,7 +153,7 @@ public class RDBPreparedStatementWrapper
} finally {
List<RDBLogEntry> l = datasource.getLog();
if (l != null) {
- String message = "statement.executeQuery()";
+ String message = "statement.executeQuery() with parameters: " + parameters;
if (x != null) {
message += " -> " + x.getMessage();
}
@@ -148,7 +179,7 @@ public class RDBPreparedStatementWrapper
} finally {
List<RDBLogEntry> l = datasource.getLog();
if (l != null) {
- String message = "statement.executeUpdate()";
+ String message = "statement.executeUpdate() with parameters: " + parameters;
if (result != null) {
message += " -> " + result;
}
@@ -244,8 +275,10 @@ public class RDBPreparedStatementWrapper
return statement.getWarnings();
}
+ // needed in Java 7...
+ @SuppressWarnings("unused")
public boolean isCloseOnCompletion() throws SQLException {
- return statement.isCloseOnCompletion();
+ throw new SQLFeatureNotSupportedException();
}
public boolean isClosed() throws SQLException {
@@ -262,82 +295,102 @@ public class RDBPreparedStatementWrapper
public void setArray(int parameterIndex, Array x) throws SQLException {
statement.setArray(parameterIndex, x);
+ record(parameterIndex, x);
}
public void setAsciiStream(int parameterIndex, InputStream x, int length) throws SQLException {
statement.setAsciiStream(parameterIndex, x, length);
+ record(parameterIndex, x);
}
public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException {
statement.setAsciiStream(parameterIndex, x, length);
+ record(parameterIndex, x);
}
public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException {
statement.setAsciiStream(parameterIndex, x);
+ record(parameterIndex, x);
}
public void setBigDecimal(int parameterIndex, BigDecimal x) throws SQLException {
statement.setBigDecimal(parameterIndex, x);
+ record(parameterIndex, x);
}
public void setBinaryStream(int parameterIndex, InputStream x, int length) throws SQLException {
statement.setBinaryStream(parameterIndex, x, length);
+ record(parameterIndex, x);
}
public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException {
statement.setBinaryStream(parameterIndex, x, length);
+ record(parameterIndex, x);
}
public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException {
statement.setBinaryStream(parameterIndex, x);
+ record(parameterIndex, x);
}
public void setBlob(int parameterIndex, Blob x) throws SQLException {
statement.setBlob(parameterIndex, x);
+ record(parameterIndex, x);
}
public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException {
statement.setBlob(parameterIndex, inputStream, length);
+ record(parameterIndex, inputStream);
}
public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {
statement.setBlob(parameterIndex, inputStream);
+ record(parameterIndex, inputStream);
}
public void setBoolean(int parameterIndex, boolean x) throws SQLException {
statement.setBoolean(parameterIndex, x);
+ record(parameterIndex, x);
}
public void setByte(int parameterIndex, byte x) throws SQLException {
statement.setByte(parameterIndex, x);
+ record(parameterIndex, x);
}
public void setBytes(int parameterIndex, byte[] x) throws SQLException {
statement.setBytes(parameterIndex, x);
+ record(parameterIndex, Arrays.asList(x));
}
public void setCharacterStream(int parameterIndex, Reader reader, int length) throws SQLException {
statement.setCharacterStream(parameterIndex, reader, length);
+ record(parameterIndex, reader);
}
public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException {
statement.setCharacterStream(parameterIndex, reader, length);
+ record(parameterIndex, reader);
}
public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {
statement.setCharacterStream(parameterIndex, reader);
+ record(parameterIndex, reader);
}
public void setClob(int parameterIndex, Clob x) throws SQLException {
statement.setClob(parameterIndex, x);
+ record(parameterIndex, x);
}
public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {
statement.setClob(parameterIndex, reader, length);
+ record(parameterIndex, reader);
}
public void setClob(int parameterIndex, Reader reader) throws SQLException {
statement.setClob(parameterIndex, reader);
+ record(parameterIndex, reader);
}
public void setCursorName(String name) throws SQLException {
@@ -346,14 +399,17 @@ public class RDBPreparedStatementWrapper
public void setDate(int parameterIndex, Date x, Calendar cal) throws SQLException {
statement.setDate(parameterIndex, x, cal);
+ record(parameterIndex, x);
}
public void setDate(int parameterIndex, Date x) throws SQLException {
statement.setDate(parameterIndex, x);
+ record(parameterIndex, x);
}
public void setDouble(int parameterIndex, double x) throws SQLException {
statement.setDouble(parameterIndex, x);
+ record(parameterIndex, x);
}
public void setEscapeProcessing(boolean enable) throws SQLException {
@@ -370,14 +426,17 @@ public class RDBPreparedStatementWrapper
public void setFloat(int parameterIndex, float x) throws SQLException {
statement.setFloat(parameterIndex, x);
+ record(parameterIndex, x);
}
public void setInt(int parameterIndex, int x) throws SQLException {
statement.setInt(parameterIndex, x);
+ record(parameterIndex, x);
}
public void setLong(int parameterIndex, long x) throws SQLException {
statement.setLong(parameterIndex, x);
+ record(parameterIndex, x);
}
public void setMaxFieldSize(int max) throws SQLException {
@@ -390,46 +449,57 @@ public class RDBPreparedStatementWrapper
public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
statement.setNCharacterStream(parameterIndex, value, length);
+ record(parameterIndex, value);
}
public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException {
statement.setNCharacterStream(parameterIndex, value);
+ record(parameterIndex, value);
}
public void setNClob(int parameterIndex, NClob value) throws SQLException {
statement.setNClob(parameterIndex, value);
+ record(parameterIndex, value);
}
public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {
statement.setNClob(parameterIndex, reader, length);
+ record(parameterIndex, reader);
}
public void setNClob(int parameterIndex, Reader reader) throws SQLException {
statement.setNClob(parameterIndex, reader);
+ record(parameterIndex, reader);
}
public void setNString(int parameterIndex, String value) throws SQLException {
statement.setNString(parameterIndex, value);
+ record(parameterIndex, value);
}
public void setNull(int parameterIndex, int sqlType, String typeName) throws SQLException {
statement.setNull(parameterIndex, sqlType, typeName);
+ record(parameterIndex, "(null)");
}
public void setNull(int parameterIndex, int sqlType) throws SQLException {
statement.setNull(parameterIndex, sqlType);
+ record(parameterIndex, "(null)");
}
public void setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength) throws SQLException {
statement.setObject(parameterIndex, x, targetSqlType, scaleOrLength);
+ record(parameterIndex, x);
}
public void setObject(int parameterIndex, Object x, int targetSqlType) throws SQLException {
statement.setObject(parameterIndex, x, targetSqlType);
+ record(parameterIndex, x);
}
public void setObject(int parameterIndex, Object x) throws SQLException {
statement.setObject(parameterIndex, x);
+ record(parameterIndex, x);
}
public void setPoolable(boolean poolable) throws SQLException {
@@ -442,6 +512,7 @@ public class RDBPreparedStatementWrapper
public void setRef(int parameterIndex, Ref x) throws SQLException {
statement.setRef(parameterIndex, x);
+ record(parameterIndex, x);
}
public void setRowId(int parameterIndex, RowId x) throws SQLException {
@@ -450,41 +521,60 @@ public class RDBPreparedStatementWrapper
public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException {
statement.setSQLXML(parameterIndex, xmlObject);
+ record(parameterIndex, xmlObject);
}
public void setShort(int parameterIndex, short x) throws SQLException {
statement.setShort(parameterIndex, x);
+ record(parameterIndex, x);
}
public void setString(int parameterIndex, String x) throws SQLException {
statement.setString(parameterIndex, x);
+ record(parameterIndex, x);
}
public void setTime(int parameterIndex, Time x, Calendar cal) throws SQLException {
statement.setTime(parameterIndex, x, cal);
+ record(parameterIndex, x);
}
public void setTime(int parameterIndex, Time x) throws SQLException {
statement.setTime(parameterIndex, x);
+ record(parameterIndex, x);
}
public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) throws SQLException {
statement.setTimestamp(parameterIndex, x, cal);
+ record(parameterIndex, x);
}
public void setTimestamp(int parameterIndex, Timestamp x) throws SQLException {
statement.setTimestamp(parameterIndex, x);
+ record(parameterIndex, x);
}
public void setURL(int parameterIndex, URL x) throws SQLException {
statement.setURL(parameterIndex, x);
+ record(parameterIndex, x);
}
public void setUnicodeStream(int parameterIndex, InputStream x, int length) throws SQLException {
statement.setUnicodeStream(parameterIndex, x, length);
+ record(parameterIndex, x);
}
public <T> T unwrap(Class<T> iface) throws SQLException {
return statement.unwrap(iface);
}
+
+ private void record(int index, Object x) {
+ List<RDBLogEntry> l = datasource.getLog();
+ if (l != null) {
+ while (parameters.size() < index) {
+ parameters.add("UNSET");
+ }
+ parameters.set(index - 1, x);
+ }
+ }
}
Copied: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBResultSetWrapper.java (from r1684669, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBResultSetWrapper.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBResultSetWrapper.java?p2=jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBResultSetWrapper.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBResultSetWrapper.java&r1=1684669&r2=1723019&rev=1723019&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBResultSetWrapper.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBResultSetWrapper.java Tue Jan 5 08:39:00 2016
@@ -30,6 +30,7 @@ import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.RowId;
import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
import java.sql.SQLWarning;
import java.sql.SQLXML;
import java.sql.Statement;
@@ -288,8 +289,10 @@ public class RDBResultSetWrapper impleme
return resultSet.getNString(columnLabel);
}
+ // needed in Java 7...
+ @SuppressWarnings("unused")
public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
- return resultSet.getObject(columnIndex, type);
+ throw new SQLFeatureNotSupportedException();
}
public Object getObject(int columnIndex, Map<String, Class<?>> map) throws SQLException {
@@ -300,8 +303,10 @@ public class RDBResultSetWrapper impleme
return resultSet.getObject(columnIndex);
}
+ // needed in Java 7...
+ @SuppressWarnings("unused")
public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
- return resultSet.getObject(columnLabel, type);
+ throw new SQLFeatureNotSupportedException();
}
public Object getObject(String columnLabel, Map<String, Class<?>> map) throws SQLException {