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/21 13:28:21 UTC
svn commit: r1725919 - in /jackrabbit/oak/branches/1.2: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/
oak-core/src/test/java/org/apache/jackrabbit/oak/...
Author: reschke
Date: Thu Jan 21 12:28:21 2016
New Revision: 1725919
URL: http://svn.apache.org/viewvc?rev=1725919&view=rev
Log:
OAK-3634: RDB/MongoDocumentStore may return stale documents (ported to 1.2)
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 21 12:28:21 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
,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,1701907,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,1707331,1707435,1707509,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1
710789,1710800,1710811,1710816,1710972,1711248,1711282,1711296,1711405,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,1715092,1715191,1715346,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717784,1717789,1717988,1718528,1718533,1718547-1718548,1718626,1718646,1718801-1718802,1718895,1719111,1719288,1719869,1720335,1720350,1720354,1720500,1721160,1721172,1722141,1722832,1723227,1723239,1723254,1723333,1723713,1723731,1724026,1724057,1724186,1724210,1724401,1724628,1724631,1725216,1725477,1725555
+/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,1701907,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,1707331,1707435,1707509,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1
710789,1710800,1710811,1710816,1710972,1711248,1711282,1711296,1711405,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,1715092,1715191,1715346,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717784,1717789,1717988,1718528,1718533,1718547-1718548,1718626,1718646,1718801-1718802,1718895,1719111,1719288,1719869,1720335,1720350,1720354,1720500,1721160,1721172,1722141,1722832,1723227,1723239,1723241,1723251,1723254,1723333,1723713,1723731,1724026,1724057,1724186,1724210,1724401,1724628,1724631,1725216,1725477,1725555
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java?rev=1725919&r1=1725918&r2=1725919&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java Thu Jan 21 12:28:21 2016
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -83,6 +82,8 @@ import com.mongodb.WriteConcern;
import com.mongodb.WriteResult;
import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Predicates.notNull;
+import static com.google.common.collect.Maps.filterValues;
/**
* A document store that uses MongoDB as the backend.
@@ -283,22 +284,9 @@ public class MongoDocumentStore implemen
LOG.trace("invalidateCache: batch size: {} of total so far {}",
ids.size(), size);
}
-
- QueryBuilder query = QueryBuilder.start(Document.ID).in(ids);
- // Fetch only the modCount and id
- final BasicDBObject fields = new BasicDBObject(Document.ID, 1);
- fields.put(Document.MOD_COUNT, 1);
-
- DBCursor cursor = nodes.find(query.get(), fields);
- cursor.setReadPreference(ReadPreference.primary());
- result.queryCount++;
- Map<String, Number> modCounts = new HashMap<String, Number>();
- for (DBObject obj : cursor) {
- String id = (String) obj.get(Document.ID);
- Number modCount = (Number) obj.get(Document.MOD_COUNT);
- modCounts.put(id, modCount);
- }
+ Map<String, Number> modCounts = getModCounts(ids);
+ result.queryCount++;
int invalidated = nodesCache.invalidateOutdated(modCounts);
result.cacheEntriesProcessedCount += modCounts.size();
@@ -911,18 +899,26 @@ public class MongoDocumentStore implemen
throw new DocumentStoreException("Update failed: " + writeResult.getError());
}
if (collection == Collection.NODES) {
+ Map<String, Number> modCounts = getModCounts(filterValues(cachedDocs, notNull()).keySet());
// update cache
for (Entry<String, NodeDocument> entry : cachedDocs.entrySet()) {
// the cachedDocs is not empty, so the collection = NODES
Lock lock = nodeLocks.acquire(entry.getKey());
try {
- if (entry.getValue() == null || entry.getValue() == NodeDocument.NULL) {
+ Number postUpdateModCount = modCounts.get(entry.getKey());
+ if (postUpdateModCount != null
+ && entry.getValue() != null
+ && entry.getValue() != NodeDocument.NULL
+ && (postUpdateModCount.longValue() - 1) == entry.getValue().getModCount()) {
+ // post update modCount is one higher than
+ // what we currently see in the cache. we can
+ // replace the cached document
+ NodeDocument newDoc = applyChanges(Collection.NODES, entry.getValue(), updateOp.shallowCopy(entry.getKey()));
+ nodesCache.replaceCachedDocument(entry.getValue(), newDoc);
+ } else {
// make sure concurrently loaded document is
// invalidated
nodesCache.invalidate(entry.getKey());
- } else {
- NodeDocument newDoc = applyChanges(Collection.NODES, entry.getValue(), updateOp.shallowCopy(entry.getKey()));
- nodesCache.replaceCachedDocument(entry.getValue(), newDoc);
}
} finally {
lock.unlock();
@@ -930,6 +926,11 @@ 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);
}
} finally {
@@ -937,6 +938,35 @@ public class MongoDocumentStore implemen
}
}
+ /**
+ * Returns the {@link Document#MOD_COUNT} value of the documents with the
+ * given {@code keys}. The returned map will only contain entries for
+ * existing documents.
+ *
+ * @param keys the keys of the documents.
+ * @return map with key to {@link Document#MOD_COUNT} value mapping.
+ * @throws MongoException if the call fails
+ */
+ @Nonnull
+ private Map<String, Number> getModCounts(Iterable<String> keys)
+ throws MongoException {
+ QueryBuilder query = QueryBuilder.start(Document.ID).in(keys);
+ // Fetch only the modCount and id
+ final BasicDBObject fields = new BasicDBObject(Document.ID, 1);
+ fields.put(Document.MOD_COUNT, 1);
+
+ DBCursor cursor = nodes.find(query.get(), fields);
+ cursor.setReadPreference(ReadPreference.primary());
+
+ Map<String, Number> modCounts = Maps.newHashMap();
+ for (DBObject obj : cursor) {
+ String id = (String) obj.get(Document.ID);
+ Number modCount = (Number) obj.get(Document.MOD_COUNT);
+ modCounts.put(id, modCount);
+ }
+ return modCounts;
+ }
+
DocumentReadPreference getReadPreference(int maxCacheAge){
if(maxCacheAge >= 0 && maxCacheAge < maxReplicationLagMillis) {
return DocumentReadPreference.PRIMARY;
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1725919&r1=1725918&r2=1725919&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Thu Jan 21 12:28:21 2016
@@ -1126,6 +1126,9 @@ public class RDBDocumentStore implements
qc.addKeys(chunkedIds);
seenQueryContext.add(qc);
}
+ for (String id : chunkedIds) {
+ nodesCache.invalidate(id);
+ }
}
Connection connection = null;
@@ -1150,23 +1153,8 @@ public class RDBDocumentStore implements
qc.addKeys(chunkedIds);
}
}
- }
- for (Entry<String, NodeDocument> entry : cachedDocs.entrySet()) {
- T oldDoc = castAsT(entry.getValue());
- String id = entry.getKey();
- Lock lock = locks.acquire(id);
- try {
- if (oldDoc == null) {
- // make sure concurrently loaded document is
- // invalidated
- nodesCache.invalidate(id);
- } else {
- addUpdateCounters(update);
- T newDoc = createNewDocument(collection, oldDoc, update);
- nodesCache.replaceCachedDocument((NodeDocument) oldDoc, (NodeDocument) newDoc);
- }
- } finally {
- lock.unlock();
+ for (String id : chunkedIds) {
+ nodesCache.invalidate(id);
}
}
} else {
Modified: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java?rev=1725919&r1=1725918&r2=1725919&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java Thu Jan 21 12:28:21 2016
@@ -445,6 +445,35 @@ public class BasicDocumentStoreTest exte
}
@Test
+ public void testModifyModified() {
+ // https://issues.apache.org/jira/browse/OAK-2940
+ String id = this.getClass().getName() + ".testModifyModified";
+ // create a test node
+ UpdateOp up = new UpdateOp(id, true);
+ up.set("_id", id);
+ up.set("_modified", 1000L);
+ boolean success = super.ds.create(Collection.NODES, Collections.singletonList(up));
+ assertTrue(success);
+ removeMe.add(id);
+
+ // update with "max" operation
+ up = new UpdateOp(id, false);
+ up.set("_id", id);
+ up.max("_modified", 2000L);
+ super.ds.update(Collection.NODES, Collections.singletonList(id), up);
+ NodeDocument nd = super.ds.find(Collection.NODES, id, 0);
+ assertEquals(((Number)nd.get("_modified")).longValue(), 2000L);
+
+ // update with "set" operation
+ up = new UpdateOp(id, false);
+ up.set("_id", id);
+ up.set("_modified", 1500L);
+ super.ds.update(Collection.NODES, Collections.singletonList(id), up);
+ nd = super.ds.find(Collection.NODES, id, 0);
+ assertEquals(((Number)nd.get("_modified")).longValue(), 1500L);
+ }
+
+ @Test
public void testInterestingStrings() {
// test case "gclef:\uD834\uDD1E" will fail on MySQL unless properly configured to use utf8mb4 charset // Assume.assumeTrue(!(super.dsname.equals("RDB-MySQL")));
Modified: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java?rev=1725919&r1=1725918&r2=1725919&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java Thu Jan 21 12:28:21 2016
@@ -20,12 +20,25 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
+import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore;
+import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MultiDocumentStoreTest extends AbstractMultiDocumentStoreTest {
+ private static final Logger LOG = LoggerFactory.getLogger(MultiDocumentStoreTest.class);
+
public MultiDocumentStoreTest(DocumentStoreFixture dsf) {
super(dsf);
}
@@ -42,7 +55,7 @@ public class MultiDocumentStoreTest exte
UpdateOp up = new UpdateOp(id, true);
up.set("_id", id);
- up.set("_foo", 0l);
+ up.set("_foo", 0);
assertTrue(super.ds1.create(Collection.NODES, Collections.singletonList(up)));
removeMe.add(id);
@@ -51,7 +64,7 @@ public class MultiDocumentStoreTest exte
for (int i = 0; i < increments; i++) {
up = new UpdateOp(id, true);
up.set("_id", id);
- up.increment("_foo", 1l);
+ up.increment("_foo", 1);
if (i % 2 == 0) {
super.ds1.update(Collection.NODES, Collections.singletonList(id), up);
}
@@ -66,82 +79,6 @@ public class MultiDocumentStoreTest exte
}
@Test
- public void testInterleavedUpdate2() {
- String id = this.getClass().getName() + ".testInterleavedUpdate2";
-
- // remove if present
- NodeDocument nd1 = super.ds1.find(Collection.NODES, id);
- if (nd1 != null) {
- super.ds1.remove(Collection.NODES, id);
- }
-
- UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
- up.set("_modified", 1L);
- assertTrue(super.ds1.create(Collection.NODES, Collections.singletonList(up)));
- removeMe.add(id);
-
- nd1 = super.ds1.find(Collection.NODES, id, 0);
- Number n = nd1.getModCount();
- if (n != null) {
- // Document store uses modCount
- int n1 = n.intValue();
-
- // get the document into ds2's cache
- NodeDocument nd2 = super.ds2.find(Collection.NODES, id, 0);
- int n2 = nd2.getModCount().intValue();
- assertEquals(n1, n2);
-
- UpdateOp upds1 = new UpdateOp(id, true);
- upds1.set("_id", id);
- upds1.set("foo", "bar");
- upds1.set("_modified", 2L);
- super.ds1.update(Collection.NODES, Collections.singletonList(id), upds1);
- nd1 = super.ds1.find(Collection.NODES, id);
- int oldn1 = n1;
- n1 = nd1.getModCount().intValue();
- assertEquals(oldn1 + 1, n1);
- assertEquals("bar", nd1.get("foo"));
-
- // modify in DS2
- UpdateOp upds2 = new UpdateOp(id, true);
- upds2.set("_id", id);
- upds2.set("foo", "qux");
- upds2.set("_modified", 3L);
- super.ds2.update(Collection.NODES, Collections.singletonList(id), upds2);
- nd2 = super.ds2.find(Collection.NODES, id);
- n2 = nd2.getModCount().intValue();
- assertEquals(oldn1 + 1, n2);
- assertEquals("qux", nd2.get("foo"));
-
- // both stores are now at the same modCount with different contents
- upds1 = new UpdateOp(id, true);
- upds1.set("_id", id);
- upds1.set("foo", "barbar");
- upds1.max("_modified", 0L);
- NodeDocument prev = super.ds1.findAndUpdate(Collection.NODES, upds1);
- // prev document should contain mod from DS2
- assertEquals("qux", prev.get("foo"));
- assertEquals(oldn1 + 2, prev.getModCount().intValue());
- assertEquals(3L, prev.getModified().intValue());
-
- // the new document must not have a _modified time smaller than
- // before the update
- nd1 = super.ds1.find(Collection.NODES, id, 0);
- assertEquals(super.dsname + ": _modified value must never ever get smaller", 3L, nd1.getModified().intValue());
-
- // verify that _modified can indeed be *set* to a smaller value, see
- // https://issues.apache.org/jira/browse/OAK-2940
- upds1 = new UpdateOp(id, true);
- upds1.set("_id", id);
- upds1.set("_modified", 0L);
- super.ds1.findAndUpdate(Collection.NODES, upds1);
- nd1 = super.ds1.find(Collection.NODES, id, 0);
- assertEquals(super.dsname + ": _modified value must be set to 0", 0L, nd1.getModified().intValue());
- }
- }
-
- @Test
public void testInvalidateCache() {
// use a "proper" ID because otherwise Mongo's cache invalidation will fail
// see OAK-2588
@@ -209,6 +146,162 @@ public class MultiDocumentStoreTest exte
assertTrue(nd1.getLastCheckTime() > ds1checktime);
}
+ @Test
+ public void testChangeVisibility() {
+ String id = this.getClass().getName() + ".testChangeVisibility";
+
+ super.ds1.remove(Collection.NODES, id);
+
+ UpdateOp up = new UpdateOp(id, true);
+ up.set("_id", id);
+ up.set("_foo", 0);
+ up.set("_bar", 0);
+ assertTrue(super.ds1.create(Collection.NODES, Collections.singletonList(up)));
+ removeMe.add(id);
+ NodeDocument orig = super.ds1.find(Collection.NODES, id);
+
+ // only run test if DS supports modcount
+ if (orig.getModCount() != null) {
+ long origMc = orig.getModCount().longValue();
+
+ UpdateOp up2 = new UpdateOp(id, false);
+ up2.set("_id", id);
+ up2.increment("_foo", 1L);
+ super.ds2.update(Collection.NODES, Collections.singletonList(id), up2);
+ NodeDocument ds2doc = super.ds2.find(Collection.NODES, id);
+ long ds2Mc = ds2doc.getModCount().longValue();
+ assertTrue("_modCount needs to be > " + origMc + " but was " + ds2Mc, ds2Mc > origMc);
+
+ UpdateOp up1 = new UpdateOp(id, false);
+ up1.set("_id", id);
+ up1.increment("_bar", 1L);
+ super.ds1.update(Collection.NODES, Collections.singletonList(id), up1);
+
+ NodeDocument ds1doc = super.ds1.find(Collection.NODES, id);
+ long ds1Mc = ds1doc.getModCount().longValue();
+ assertTrue("_modCount needs to be > " + ds2Mc + " but was " + ds1Mc, ds1Mc > ds2Mc);
+ }
+ }
+
+ @Test
+ public void concurrentUpdate() throws Exception {
+ String id = Utils.getIdFromPath("/foo");
+ ds1.remove(Collection.NODES, id);
+ ds2.invalidateCache();
+ removeMe.add(id);
+ UpdateOp op = new UpdateOp(id, true);
+ op.set(Document.ID, id);
+ ds1.create(Collection.NODES, Collections.singletonList(op));
+
+ List<Exception> exceptions = Collections.synchronizedList(new ArrayList<Exception>());
+ List<Thread> threads = Lists.newArrayList();
+ threads.add(new Thread(new Updater(ds1, id, exceptions)));
+ threads.add(new Thread(new Updater(ds2, id, exceptions)));
+ Reader r = new Reader(id, exceptions, ds1, ds2);
+ Thread reader = new Thread(r);
+ for (Thread t : threads) {
+ t.start();
+ }
+ reader.start();
+ for (Thread t : threads) {
+ t.join();
+ }
+ r.terminate();
+ reader.join();
+ for (Exception e : exceptions) {
+ throw e;
+ }
+ }
+
+ private static final class Reader implements Runnable {
+
+ private final String id;
+ private final List<Exception> exceptions;
+ private final List<DocumentStore> stores;
+ private volatile boolean terminate = false;
+ private final Map<Long, NodeDocument> docs = Maps.newHashMap();
+
+ public Reader(String id, List<Exception> exceptions, DocumentStore... stores) {
+ this.id = id;
+ this.exceptions = exceptions;
+ this.stores = Lists.newArrayList(stores);
+ }
+
+ void terminate() {
+ terminate = true;
+ }
+
+ @Override
+ public void run() {
+ Random random = new Random();
+ while (!terminate) {
+ try {
+ DocumentStore ds = stores.get(random.nextInt(stores.size()));
+ NodeDocument d = ds.find(Collection.NODES, id);
+ long modCount = d.getModCount().longValue();
+ NodeDocument seen = docs.get(modCount);
+ if (seen == null) {
+ docs.put(modCount, d);
+ } else {
+ Map<String, Object> expected = getPropertyValues(seen);
+ Map<String, Object> actual = getPropertyValues(d);
+ assertEquals(expected, actual);
+ }
+ Thread.sleep(random.nextInt(1));
+ } catch (AssertionError e) {
+ exceptions.add(new Exception(e.getMessage()));
+ break;
+ } catch (Exception e) {
+ exceptions.add(e);
+ break;
+ }
+ }
+ }
+
+ static Map<String, Object> getPropertyValues(NodeDocument doc) {
+ Map<String, Object> props = Maps.newHashMap();
+ for (String k : doc.keySet()) {
+ if (Utils.isPropertyName(k)) {
+ props.put(k, doc.get(k));
+ }
+ }
+ return props;
+ }
+ }
+
+ private static final class Updater implements Runnable {
+
+ private final DocumentStore ds;
+ private final String id;
+ private final List<Exception> exceptions;
+ private long counter = 0;
+
+ public Updater(DocumentStore ds, String id, List<Exception> exceptions) {
+ this.ds = ds;
+ this.id = id;
+ this.exceptions = exceptions;
+ }
+
+ @Override
+ public void run() {
+ String p = Thread.currentThread().getName();
+ for (int i = 0; i < 1000; i++) {
+ UpdateOp op = new UpdateOp(id, false);
+ op.set(p, counter++);
+ try {
+ ds.update(Collection.NODES, Collections.singletonList(id), op);
+ } catch (Exception e) {
+ if (ds instanceof RDBDocumentStore
+ && e.getMessage().contains("race?")) {
+ LOG.warn(e.toString());
+ } else {
+ exceptions.add(e);
+ }
+ }
+ }
+ }
+ }
+
private static long letTimeElapse() {
long ts = System.currentTimeMillis();
while (System.currentTimeMillis() == ts) {