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 2017/03/13 13:11:19 UTC
svn commit: r1786679 - in /jackrabbit/oak/branches/1.4: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/
Author: reschke
Date: Mon Mar 13 13:11:19 2017
New Revision: 1786679
URL: http://svn.apache.org/viewvc?rev=1786679&view=rev
Log:
OAK-4793: RDBDocumentStore: make sure cache is invalidated upon JDBC exceptions (ported to 1.4)
Added:
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBCacheConsistencyTest.java
- copied unchanged from r1760946, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBCacheConsistencyTest.java
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionWrapper.java
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 13 13:11:19 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746634,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287
,1750457,1750462,1750465,1750495,1750626,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1760677,1760701,1761412,1761444,1761571,1761762,1761787,1761876,1762453,1762612,1762632,1762635,1763347,1763355-1763356,1763378,1763465,1763735,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766390,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767704,1768446,1768637,1769078,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772162,1772228,1772593,1772768,1773190,1774497,1775474,1775622,1775628,1775757,1778423,1778968,1779478,1780388,1780538,1780
543,1781068,1781075,1781386,1781846,1781907,1782476,1783066,1783089,1783104-1783105,1783619,1783855,1784023,1784130,1784251,1784574,1784689,1785283
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746634,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287
,1750457,1750462,1750465,1750495,1750626,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1760677,1760701,1760946,1761412,1761444,1761571,1761762,1761787,1761876,1762453,1762612,1762632,1762635,1763347,1763355-1763356,1763378,1763465,1763735,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766390,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767704,1768446,1768637,1769078,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772162,1772228,1772593,1772768,1773190,1774497,1775474,1775622,1775628,1775757,1778423,1778968,1779478,1780388,1780
538,1780543,1781068,1781075,1781386,1781846,1781907,1782476,1783066,1783089,1783104-1783105,1783619,1783855,1784023,1784130,1784251,1784574,1784689,1785283
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1786679&r1=1786678&r2=1786679&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Mon Mar 13 13:11:19 2017
@@ -480,7 +480,7 @@ public class RDBDocumentStore implements
return result;
} catch (SQLException ex) {
this.ch.rollbackConnection(connection);
- throw new DocumentStoreException(ex);
+ throw handleException("update failed for: " + keysToUpdate, ex, collection, keysToUpdate);
} finally {
this.ch.closeConnection(connection);
}
@@ -1515,7 +1515,7 @@ public class RDBDocumentStore implements
db.delete(connection, tmd, Collections.singletonList(id));
connection.commit();
} catch (Exception ex) {
- throw new DocumentStoreException(ex);
+ throw handleException("removing " + id, ex, collection, id);
} finally {
this.ch.closeConnection(connection);
}
@@ -1531,7 +1531,7 @@ public class RDBDocumentStore implements
numDeleted += db.delete(connection, tmd, sublist);
connection.commit();
} catch (Exception ex) {
- throw new DocumentStoreException(ex);
+ throw handleException("removing " + ids, ex, collection, ids);
} finally {
this.ch.closeConnection(connection);
}
@@ -1555,7 +1555,8 @@ public class RDBDocumentStore implements
numDeleted += db.delete(connection, tmd, subMap);
connection.commit();
} catch (Exception ex) {
- throw DocumentStoreException.convert(ex);
+ Set<String> ids = subMap.keySet();
+ throw handleException("deleting " + ids, ex, collection, ids);
} finally {
this.ch.closeConnection(connection);
}
@@ -1621,7 +1622,7 @@ public class RDBDocumentStore implements
}
String message = String.format("Update for %s failed%s", document.getId(), addDiags);
LOG.debug(message, ex);
- throw new DocumentStoreException(message, ex);
+ throw handleException(message, ex, collection, document.getId());
} finally {
this.ch.closeConnection(connection);
}
@@ -1719,7 +1720,7 @@ public class RDBDocumentStore implements
LOG.debug("additional diagnostics: " + messages);
}
- throw new DocumentStoreException(message, ex);
+ throw handleException(message, ex, collection, ids);
} finally {
this.ch.closeConnection(connection);
}
@@ -1888,6 +1889,21 @@ public class RDBDocumentStore implements
return nodesCache;
}
+ private <T extends Document> DocumentStoreException handleException(String message, Exception ex, Collection<T> collection,
+ java.util.Collection<String> ids) {
+ if (collection == Collection.NODES) {
+ for (String id : ids) {
+ invalidateCache(collection, id, false);
+ }
+ }
+ return DocumentStoreException.convert(ex, message);
+ }
+
+ private <T extends Document> DocumentStoreException handleException(String message, Exception ex, Collection<T> collection,
+ String id) {
+ return handleException(message, ex, collection, Collections.singleton(id));
+ }
+
// slightly extended query support
protected static class QueryCondition {
Modified: jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionWrapper.java?rev=1786679&r1=1786678&r2=1786679&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionWrapper.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionWrapper.java Mon Mar 13 13:11:19 2017
@@ -43,6 +43,7 @@ public class RDBConnectionWrapper implem
private final RDBDataSourceWrapper datasource;
private final Connection connection;
private final long constart;
+ private boolean isReadOnly = false;
public RDBConnectionWrapper(RDBDataSourceWrapper datasource, Connection connection) {
this.datasource = datasource;
@@ -85,6 +86,9 @@ public class RDBConnectionWrapper implem
SQLException x = null;
try {
connection.commit();
+ if (this.datasource.getTemporaryUpdateException() != null && !isReadOnly) {
+ throw new SQLException(this.datasource.getTemporaryUpdateException());
+ }
} catch (SQLException ex) {
x = ex;
throw ex;
@@ -323,8 +327,9 @@ public class RDBConnectionWrapper implem
throw new SQLFeatureNotSupportedException();
}
- public void setReadOnly(boolean arg0) throws SQLException {
- connection.setReadOnly(arg0);
+ public void setReadOnly(boolean readOnly) throws SQLException {
+ this.isReadOnly = readOnly;
+ connection.setReadOnly(readOnly);
}
public Savepoint setSavepoint() throws SQLException {
Modified: jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java?rev=1786679&r1=1786678&r2=1786679&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java Mon Mar 13 13:11:19 2017
@@ -54,6 +54,7 @@ public class RDBDataSourceWrapper implem
private final DataSource ds;
private boolean batchResultPrecise = true;
+ private String temporaryUpdateException = null;
// Logging
@@ -96,6 +97,14 @@ public class RDBDataSourceWrapper implem
return this.batchResultPrecise;
}
+ public void setTemporaryUpdateException(String exmsg) {
+ this.temporaryUpdateException = exmsg;
+ }
+
+ public String getTemporaryUpdateException() {
+ return this.temporaryUpdateException;
+ }
+
// DataSource
public RDBDataSourceWrapper(DataSource ds) {