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 mr...@apache.org on 2017/03/20 13:17:47 UTC
svn commit: r1787766 - in /jackrabbit/oak/branches/1.4: ./ oak-core/
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/
oak-core/src/test/java/com/ oak-core/src/test/java/com/mongodb/
oak-core/src/test/java/org/apache/jackrabbit/o...
Author: mreutegg
Date: Mon Mar 20 13:17:47 2017
New Revision: 1787766
URL: http://svn.apache.org/viewvc?rev=1787766&view=rev
Log:
OAK-4774: Check usage of DocumentStoreException in MongoDocumentStore
Merge revisions r1760709,1761866 from trunk
Added:
jackrabbit/oak/branches/1.4/oak-core/src/test/java/com/
- copied from r1760709, jackrabbit/oak/trunk/oak-core/src/test/java/com/
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoCacheConsistencyTest.java
- copied unchanged from r1760709, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoCacheConsistencyTest.java
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-core/pom.xml
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
jackrabbit/oak/branches/1.4/oak-core/src/test/java/com/mongodb/OakFongo.java
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 20 13:17:47 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,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,1774787,1775474,1775622,1775628,1775757,1778112,1778423,1778968,1779
137,1779478,1780388,1780538,1780543,1781068,1781075,1781386,1781846,1781907,1782476,1783066,1783089,1783104-1783105,1783619,1783855,1784023,1784130,1784251,1784574,1784689,1785283,1787074,1787217
+/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,1760709,1760946,1761412,1761444,1761571,1761762,1761787,1761866,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,1774787,1775474,1775622,1775628,1775757,1778112,1778
423,1778968,1779137,1779478,1780388,1780538,1780543,1781068,1781075,1781386,1781846,1781907,1782476,1783066,1783089,1783104-1783105,1783619,1783855,1784023,1784130,1784251,1784574,1784689,1785283,1787074,1787217
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.4/oak-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/pom.xml?rev=1787766&r1=1787765&r2=1787766&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/pom.xml (original)
+++ jackrabbit/oak/branches/1.4/oak-core/pom.xml Mon Mar 20 13:17:47 2017
@@ -38,6 +38,10 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
+ <Import-Package>
+ com.mongodb*;resolution:=optional,
+ *
+ </Import-Package>
<Export-Package>
org.apache.jackrabbit.oak,
org.apache.jackrabbit.oak.api,
@@ -346,5 +350,11 @@
<version>1.1.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.github.fakemongo</groupId>
+ <artifactId>fongo</artifactId>
+ <version>1.6.8</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java?rev=1787766&r1=1787765&r2=1787766&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java Mon Mar 20 13:17:47 2017
@@ -43,6 +43,7 @@ import javax.annotation.Nullable;
import com.google.common.base.Stopwatch;
import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.UncheckedExecutionException;
@@ -786,7 +787,7 @@ public class MongoDocumentStore implemen
}
return oldDoc;
} catch (Exception e) {
- throw DocumentStoreException.convert(e);
+ throw handleException(e, collection, updateOp.getId());
} finally {
if (lock != null) {
lock.unlock();
@@ -886,6 +887,14 @@ public class MongoDocumentStore implemen
results.put(op, oldDoc);
}
}
+ } catch (MongoException e) {
+ throw handleException(e, collection, Iterables.transform(updateOps,
+ new Function<UpdateOp, String>() {
+ @Override
+ public String apply(UpdateOp input) {
+ return input.getId();
+ }
+ }));
} finally {
stats.doneCreateOrUpdate(watch.elapsed(TimeUnit.NANOSECONDS),
collection, Lists.transform(updateOps, new Function<UpdateOp, String>() {
@@ -1169,12 +1178,7 @@ public class MongoDocumentStore implemen
}
}
} catch (MongoException e) {
- // some documents may still have been updated
- // invalidate all documents affected by this update call
- for (String k : keys) {
- nodesCache.invalidate(k);
- }
- throw DocumentStoreException.convert(e);
+ throw handleException(e, collection, keys);
}
} finally {
stats.doneUpdate(watch.elapsed(TimeUnit.NANOSECONDS), collection, keys.size());
@@ -1582,6 +1586,23 @@ public class MongoDocumentStore implemen
return diff;
}
+ private <T extends Document> DocumentStoreException handleException(Exception ex,
+ Collection<T> collection,
+ Iterable<String> ids) {
+ if (collection == Collection.NODES) {
+ for (String id : ids) {
+ invalidateCache(collection, id);
+ }
+ }
+ return DocumentStoreException.convert(ex);
+ }
+
+ private <T extends Document> DocumentStoreException handleException(Exception ex,
+ Collection<T> collection,
+ String id) {
+ return handleException(ex, collection, Collections.singleton(id));
+ }
+
private static class BulkUpdateResult {
private final Set<String> failedUpdates;
Modified: jackrabbit/oak/branches/1.4/oak-core/src/test/java/com/mongodb/OakFongo.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/com/mongodb/OakFongo.java?rev=1787766&r1=1760709&r2=1787766&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/test/java/com/mongodb/OakFongo.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/test/java/com/mongodb/OakFongo.java Mon Mar 20 13:17:47 2017
@@ -21,17 +21,6 @@ import java.util.List;
import java.util.Map;
import com.github.fakemongo.Fongo;
-import com.mongodb.CommandResult;
-import com.mongodb.DBEncoder;
-import com.mongodb.DBObject;
-import com.mongodb.FongoDB;
-import com.mongodb.FongoDBCollection;
-import com.mongodb.InsertOptions;
-import com.mongodb.MongoException;
-import com.mongodb.ReadPreference;
-import com.mongodb.WriteConcern;
-import com.mongodb.WriteResult;
-import com.mongodb.connection.ServerVersion;
public class OakFongo extends Fongo {
@@ -117,11 +106,24 @@ public class OakFongo extends Fongo {
@Override
public CommandResult command(DBObject cmd,
+ int options,
+ ReadPreference readPrefs) {
+ if (cmd.containsField("buildInfo")) {
+ CommandResult commandResult = okResult();
+ commandResult.append("version", "2.6.0");
+ return commandResult;
+ } else {
+ return super.command(cmd, options, readPrefs);
+ }
+ }
+
+ @Override
+ public CommandResult command(DBObject cmd,
ReadPreference readPreference,
DBEncoder encoder) {
if (cmd.containsField("serverStatus")) {
CommandResult commandResult = okResult();
- commandResult.append("version", asString(getServerVersion()));
+ commandResult.append("version", "2.6.0");
return commandResult;
} else {
return super.command(cmd, readPreference, encoder);
@@ -163,10 +165,11 @@ public class OakFongo extends Fongo {
}
@Override
- public WriteResult insert(List<? extends DBObject> documents,
- InsertOptions insertOptions) {
- beforeInsert(documents, insertOptions);
- WriteResult result = super.insert(documents, insertOptions);
+ public WriteResult insert(List<DBObject> documents,
+ WriteConcern concern,
+ DBEncoder encoder) {
+ beforeInsert(documents, null);
+ WriteResult result = super.insert(documents, concern, encoder);
afterInsert(result);
return result;
}