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/12/16 10:58:57 UTC
svn commit: r1818379 - in /jackrabbit/oak/branches/1.4/oak-core: ./
src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/
src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/
src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/
Author: reschke
Date: Sat Dec 16 10:58:56 2017
New Revision: 1818379
URL: http://svn.apache.org/viewvc?rev=1818379&view=rev
Log:
OAK-7068: RDBBlobStore may wrap SQLExceptions into RuntimeExceptions (ported to 1.4)
Modified:
jackrabbit/oak/branches/1.4/oak-core/ (props changed)
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreFixture.java
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBPreparedStatementWrapper.java
Propchange: jackrabbit/oak/branches/1.4/oak-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 16 10:58:56 2017
@@ -1,5 +1,5 @@
/jackrabbit/oak/branches/1.0/oak-core:1665962
/jackrabbit/oak/branches/1.6/oak-core:1802566
/jackrabbit/oak/trunk/oak-core: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-175007
7,1750287,1750457,1750462,1750465,1750495,1750626,1750656,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,1753481,1754117,1754239,1755157,1755191,1756505-1756506,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759754,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1760677,1760701,1760709,1760946,1761412,1761444,1761571,1761762,1761787,1761866,1761876,1762453,1762463,1762612,1762632,1762635,1762825,1763347,1763355-1763356,1763378,1763465,1763735,1764475,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766390,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767502,1767704,1768446,1768637,1769078,1769939-1769940,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,177
2162,1772228,1772593,1772768,1772906,1773190,1774141,1774256,1774497,1774787,1775474,1775622,1775628,1775757,1778112,1778423,1778968,1779137,1779478,1780388,1780424,1780538,1780543,1781068,1781075,1781386,1781846,1781907,1782476,1782966,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783738,1783773,1783855,1783891,1784023,1784034,1784130,1784251,1784551,1784574,1784689,1785283,1785838,1785946,1787074,1787217,1787425,1789056,1792463,1792742,1793013,1793088,1793644,1795314,1795330,1795475,1795488,1795491,1795613,1795618,1796144,1798035,1798834,1799219,1799389,1799924,1800974,1801011,1801013,1802548,1802973,1803026,1807308,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809163,1811380,1811952,1811963,1811986,1814332
-/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1815450,1815466,1818301
+/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1815450,1815466,1818301,1818303
/jackrabbit/trunk/oak-core:1345480
Modified: jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java?rev=1818379&r1=1818378&r2=1818379&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java Sat Dec 16 10:58:56 2017
@@ -265,7 +265,7 @@ public class RDBBlobStore extends Cachin
}
catch (SQLException ex) {
LOG.error("trying to update metadata", ex);
- throw new RuntimeException("trying to update metadata", ex);
+ throw new SQLException("trying to update metadata", ex);
}
finally {
prep.close();
@@ -305,13 +305,13 @@ public class RDBBlobStore extends Cachin
// insert failed although record isn't there
String message = "insert document failed for id " + id + " with length " + data.length + " (check max size of datastore_data.data)";
LOG.error(message, ex);
- throw new RuntimeException(message, ex);
+ throw new SQLException(message, ex);
}
else if (!Arrays.equals(data, dbdata)) {
// record is there but contains different data
String message = "DATA table already contains blob for id " + id + ", but the actual data differs (lengths: " + data.length + ", " + dbdata.length + ")";
LOG.error(message, ex);
- throw new RuntimeException(message, ex);
+ throw new SQLException(message, ex);
}
else {
// just recover
Modified: jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreFixture.java?rev=1818379&r1=1818378&r2=1818379&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreFixture.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreFixture.java Sat Dec 16 10:58:56 2017
@@ -16,8 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.document.blob;
-import javax.sql.DataSource;
-
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBBlobStore;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDataSourceFactory;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDataSourceWrapper;
@@ -32,6 +30,8 @@ public abstract class RDBBlobStoreFixtur
public abstract RDBBlobStore createRDBBlobStore();
+ public abstract RDBDataSourceWrapper getDataSource();
+
public abstract String getName();
public abstract void dispose();
@@ -67,7 +67,7 @@ public abstract class RDBBlobStoreFixtur
private static class MyFixture extends RDBBlobStoreFixture {
private String name;
- private DataSource dataSource;
+ private RDBDataSourceWrapper dataSource;
private RDBBlobStore bs;
private RDBOptions options = new RDBOptions().tablePrefix(TABLEPREFIX).dropTablesOnClose(true);
@@ -80,6 +80,10 @@ public abstract class RDBBlobStoreFixtur
}
}
+ public RDBDataSourceWrapper getDataSource() {
+ return dataSource;
+ }
+
@Override
public String getName() {
return name;
Modified: jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java?rev=1818379&r1=1818378&r2=1818379&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java Sat Dec 16 10:58:56 2017
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.oak.plugins.document.blob;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.IOException;
import java.security.MessageDigest;
@@ -28,10 +29,10 @@ import java.util.Iterator;
import java.util.List;
import java.util.Random;
-import com.google.common.collect.ImmutableList;
import org.apache.jackrabbit.oak.commons.StringUtils;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBBlobStore;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBBlobStoreFriend;
+import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDataSourceWrapper;
import org.apache.jackrabbit.oak.spi.blob.AbstractBlobStoreTest;
import org.junit.After;
import org.junit.Assert;
@@ -42,6 +43,7 @@ import org.junit.runners.Parameterized;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
/**
@@ -73,12 +75,14 @@ public class RDBBlobStoreTest extends Ab
private RDBBlobStore blobStore;
private String blobStoreName;
+ private RDBDataSourceWrapper dsw;
private static final Logger LOG = LoggerFactory.getLogger(RDBBlobStoreTest.class);
public RDBBlobStoreTest(RDBBlobStoreFixture bsf) {
blobStore = bsf.createRDBBlobStore();
blobStoreName = bsf.getName();
+ dsw = bsf.getDataSource();
}
@Before
@@ -242,6 +246,24 @@ public class RDBBlobStoreTest extends Ab
}
}
+ @Test
+ public void testExceptionHandling() throws Exception {
+ // see OAK-7068
+ try {
+ int test = 1024 * 1024;
+ byte[] data = new byte[test];
+ Random r = new Random(0);
+ r.nextBytes(data);
+ byte[] digest = getDigest(data);
+ dsw.setTemporaryUpdateException("testExceptionHandling");
+ RDBBlobStoreFriend.storeBlock(blobStore, digest, 0, data);
+ fail("expects IOException");
+ } catch (IOException expected) {
+ } finally {
+ dsw.setTemporaryUpdateException(null);
+ }
+ }
+
private byte[] getDigest(byte[] bytes) throws IOException {
MessageDigest messageDigest;
try {
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=1818379&r1=1818378&r2=1818379&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 Sat Dec 16 10:58:56 2017
@@ -55,6 +55,7 @@ public class RDBDataSourceWrapper implem
private final DataSource ds;
private boolean batchResultPrecise = true;
private String temporaryCommitException = null;
+ private String temporaryUpdateException = null;
// Logging
@@ -105,6 +106,14 @@ public class RDBDataSourceWrapper implem
return this.temporaryCommitException;
}
+ public void setTemporaryUpdateException(String exmsg) {
+ this.temporaryUpdateException = exmsg;
+ }
+
+ public String getTemporaryUpdateException() {
+ return this.temporaryUpdateException;
+ }
+
// DataSource
public RDBDataSourceWrapper(DataSource ds) {
Modified: jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBPreparedStatementWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBPreparedStatementWrapper.java?rev=1818379&r1=1818378&r2=1818379&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBPreparedStatementWrapper.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBPreparedStatementWrapper.java Sat Dec 16 10:58:56 2017
@@ -189,6 +189,9 @@ public class RDBPreparedStatementWrapper
long start = System.nanoTime();
SQLException x = null;
Integer result = null;
+ if (this.datasource.getTemporaryUpdateException() != null) {
+ throw new SQLException(this.datasource.getTemporaryUpdateException());
+ }
try {
result = statement.executeUpdate();
return result;