Author: reschke
Date: Wed Jan 20 16:25:36 2016
New Revision: 1725751
URL: http://svn.apache.org/viewvc?rev=1725751&view=rev
Log:
OAK-3649: Extract node document cache from Mongo and RDB document stores
(ported to 1.2)
Added:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java
- copied unchanged from r1718528,
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/locks/
- copied from r1718528,
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/locks/
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
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/mongo/CacheConsistencyIT.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 20 16:25:36 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,1718533,1718547-1718548,1718626,1718646,1718801-1718802,1718895,1719111,1719288,1719869,1720335,1720350,1720354,1720500,1721160,1721172,1722141,1722832,1723227,1723239,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,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/DocumentMK.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java?rev=1725751&r1=1725750&r2=1725751&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
Wed Jan 20 16:25:36 2016
@@ -36,6 +36,7 @@ import org.apache.jackrabbit.mk.api.Micr
import org.apache.jackrabbit.mk.api.MicroKernelException;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.cache.CacheLIRS;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.cache.CacheValue;
import org.apache.jackrabbit.oak.cache.EmpiricalWeigher;
import org.apache.jackrabbit.oak.commons.PathUtils;
@@ -43,6 +44,8 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.commons.json.JsopStream;
import org.apache.jackrabbit.oak.commons.json.JsopTokenizer;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeState.Children;
+import org.apache.jackrabbit.oak.plugins.document.cache.NodeDocumentCache;
+import org.apache.jackrabbit.oak.plugins.document.locks.NodeDocumentLocks;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoBlobStore;
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
@@ -904,6 +907,12 @@ public class DocumentMK implements Micro
return buildCache(CacheType.DOCUMENT, getDocumentCacheSize(),
null, docStore);
}
+ public NodeDocumentCache buildNodeDocumentCache(DocumentStore
docStore, NodeDocumentLocks locks) {
+ Cache<CacheValue, NodeDocument> cache =
buildDocumentCache(docStore);
+ CacheStats cacheStats = new CacheStats(cache,
"Document-Documents", getWeigher(), getDocumentCacheSize());
+ return new NodeDocumentCache(cache, cacheStats, locks);
+ }
+
private <K extends CacheValue, V extends CacheValue> Cache<K, V>
buildCache(
CacheType cacheType,
long maxWeight,
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=1725751&r1=1725750&r2=1725751&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
Wed Jan 20 16:25:36 2016
@@ -16,12 +16,12 @@
*/
package org.apache.jackrabbit.oak.plugins.document.mongo;
-import java.io.Closeable;
import java.io.IOException;
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;
@@ -30,9 +30,7 @@ import java.util.TreeMap;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReadWriteLock;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -50,7 +48,6 @@ import com.mongodb.ReadPreference;
import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.cache.CacheValue;
-import org.apache.jackrabbit.oak.plugins.document.CachedNodeDocument;
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.Document;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
@@ -66,19 +63,15 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Operation;
import org.apache.jackrabbit.oak.plugins.document.UpdateUtils;
import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats;
-import org.apache.jackrabbit.oak.plugins.document.util.StringValue;
+import org.apache.jackrabbit.oak.plugins.document.cache.NodeDocumentCache;
+import org.apache.jackrabbit.oak.plugins.document.locks.TreeNodeDocumentLocks;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.apache.jackrabbit.oak.stats.Clock;
import org.apache.jackrabbit.oak.util.PerfLogger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Objects;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
-import com.google.common.util.concurrent.Striped;
import com.mongodb.BasicDBObject;
import com.mongodb.DB;
import com.mongodb.DBCollection;
@@ -90,7 +83,6 @@ import com.mongodb.WriteConcern;
import com.mongodb.WriteResult;
import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
/**
* A document store that uses MongoDB as the backend.
@@ -120,28 +112,9 @@ public class MongoDocumentStore implemen
private final DB db;
- private final Cache<CacheValue, NodeDocument> nodesCache;
- private final CacheStats cacheStats;
+ private final NodeDocumentCache nodesCache;
- /**
- * Locks to ensure cache consistency on reads, writes and invalidation.
- */
- private final Striped<Lock> locks = Striped.lock(128);
-
- /**
- * ReadWriteLocks to synchronize cache access when child documents are
- * requested from MongoDB and put into the cache. Accessing a single
- * document in the cache will acquire a read (shared) lock for the parent
- * key in addition to the lock (from {@link #locks}) for the individual
- * document. Reading multiple sibling documents will acquire a write
- * (exclusive) lock for the parent key. See OAK-1897.
- */
- private final Striped<ReadWriteLock> parentLocks =
Striped.readWriteLock(64);
-
- /**
- * Counts how many times {@link TreeLock}s were acquired.
- */
- private final AtomicLong lockAcquisitionCounter = new AtomicLong();
+ private final TreeNodeDocumentLocks nodeLocks;
private Clock clock = Clock.SIMPLE;
@@ -178,8 +151,8 @@ public class MongoDocumentStore implemen
/**
* Duration in milliseconds after a mongo query with an additional
* constraint (e.g. _modified) on the NODES collection times out and is
- * executed again without holding a {@link TreeLock} and without updating
- * the cache with data retrieved from MongoDB.
+ * executed again without holding a {@link TreeNodeDocumentLocks.TreeLock}
+ * and without updating the cache with data retrieved from MongoDB.
* <p>
* Default is 3000 (three seconds).
*/
@@ -242,10 +215,9 @@ public class MongoDocumentStore implemen
options.put("unique", Boolean.FALSE);
this.journal.ensureIndex(index, options);
+ this.nodeLocks = new TreeNodeDocumentLocks();
+ this.nodesCache = builder.buildNodeDocumentCache(this, nodeLocks);
- nodesCache = builder.buildDocumentCache(this);
- cacheStats = new CacheStats(nodesCache, "Document-Documents",
builder.getWeigher(),
- builder.getDocumentCacheSize());
LOG.info("Configuration maxReplicationLagMillis {}, " +
"maxDeltaForModTimeIdxSecs {}, disableIndexHint {}",
maxReplicationLagMillis, maxDeltaForModTimeIdxSecs,
disableIndexHint);
@@ -288,7 +260,7 @@ public class MongoDocumentStore implemen
}
return result;
}
-
+
@Override
public CacheInvalidationStats invalidateCache(Iterable<String> keys) {
LOG.debug("invalidateCache: start");
@@ -301,7 +273,7 @@ public class MongoDocumentStore implemen
final List<String> ids = new
ArrayList<String>(IN_CLAUSE_BATCH_SIZE);
while(it.hasNext() && ids.size() < IN_CLAUSE_BATCH_SIZE) {
final String id = it.next();
- if (getCachedNodeDoc(id) != null) {
+ if (nodesCache.getIfPresent(id) != null) {
// only add those that we actually do have cached
ids.add(id);
}
@@ -320,21 +292,18 @@ public class MongoDocumentStore implemen
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) {
- result.cacheEntriesProcessedCount++;
String id = (String) obj.get(Document.ID);
Number modCount = (Number) obj.get(Document.MOD_COUNT);
-
- CachedNodeDocument cachedDoc = getCachedNodeDoc(id);
- if (cachedDoc != null
- && !Objects.equal(cachedDoc.getModCount(), modCount)) {
- invalidateCache(Collection.NODES, id);
- result.invalidationCount++;
- } else {
- result.upToDateCount++;
- }
+ modCounts.put(id, modCount);
}
+
+ int invalidated = nodesCache.invalidateOutdated(modCounts);
+ result.cacheEntriesProcessedCount += modCounts.size();
+ result.invalidationCount += invalidated;
+ result.upToDateCount = modCounts.size() - invalidated;
}
result.cacheSize = size;
@@ -345,22 +314,10 @@ public class MongoDocumentStore implemen
@Override
public <T extends Document> void invalidateCache(Collection<T> collection,
String key) {
if (collection == Collection.NODES) {
- TreeLock lock = acquire(key);
- try {
- nodesCache.invalidate(new StringValue(key));
- } finally {
- lock.unlock();
- }
- }
- }
-
- public <T extends Document> void invalidateCache(Collection<T> collection,
List<String> keys) {
- for(String key : keys){
- invalidateCache(collection, key);
+ nodesCache.invalidate(key);
}
}
-
@Override
public <T extends Document> T find(Collection<T> collection, String key) {
final long start = PERFLOG.start();
@@ -388,11 +345,10 @@ public class MongoDocumentStore implemen
return findUncachedWithRetry(collection, key,
DocumentReadPreference.PRIMARY, 2);
}
- CacheValue cacheKey = new StringValue(key);
NodeDocument doc;
if (maxCacheAge > 0 || preferCached) {
// first try without lock
- doc = nodesCache.getIfPresent(cacheKey);
+ doc = nodesCache.getIfPresent(key);
if (doc != null) {
if (preferCached ||
getTime() - doc.getCreated() < maxCacheAge) {
@@ -405,12 +361,12 @@ public class MongoDocumentStore implemen
}
Throwable t;
try {
- TreeLock lock = acquire(key);
+ Lock lock = nodeLocks.acquire(key);
try {
if (maxCacheAge > 0 || preferCached) {
// try again some other thread may have populated
// the cache by now
- doc = nodesCache.getIfPresent(cacheKey);
+ doc = nodesCache.getIfPresent(key);
if (doc != null) {
if (preferCached ||
getTime() - doc.getCreated() < maxCacheAge) {
@@ -425,7 +381,7 @@ public class MongoDocumentStore implemen
collection, key,
getReadPreference(maxCacheAge), 2);
invalidateCache(collection, key);
- doc = nodesCache.get(cacheKey, new Callable<NodeDocument>() {
+ doc = nodesCache.get(key, new Callable<NodeDocument>() {
@Override
public NodeDocument call() throws Exception {
return d == null ? NodeDocument.NULL : d;
@@ -608,7 +564,7 @@ public class MongoDocumentStore implemen
String parentId = Utils.getParentIdFromLowerLimit(fromKey);
long lockTime = -1;
final long start = PERFLOG.start();
- TreeLock lock = withLock ? acquireExclusive(parentId != null ?
parentId : "") : null;
+ Lock lock = withLock ? nodeLocks.acquireExclusive(parentId != null ?
parentId : "") : null;
try {
if (start != -1) {
lockTime = System.currentTimeMillis() - start;
@@ -639,26 +595,7 @@ public class MongoDocumentStore implemen
if (collection == Collection.NODES
&& doc != null
&& lock != null) {
- doc.seal();
- String id = doc.getId();
- CacheValue cacheKey = new StringValue(id);
- // do not overwrite document in cache if the
- // existing one in the cache is newer
- NodeDocument cached =
nodesCache.getIfPresent(cacheKey);
- if (cached != null && cached != NodeDocument.NULL) {
- // check mod count
- Number cachedModCount = cached.getModCount();
- Number modCount = doc.getModCount();
- if (cachedModCount == null || modCount == null) {
- throw new IllegalStateException(
- "Missing " + Document.MOD_COUNT);
- }
- if (modCount.longValue() >
cachedModCount.longValue()) {
- nodesCache.put(cacheKey, (NodeDocument) doc);
- }
- } else {
- nodesCache.put(cacheKey, (NodeDocument) doc);
- }
+ nodesCache.putIfNewer((NodeDocument) doc);
}
list.add(doc);
}
@@ -709,7 +646,11 @@ public class MongoDocumentStore implemen
} catch (Exception e) {
throw DocumentStoreException.convert(e, "Remove failed for
" + keyBatch);
} finally {
- invalidateCache(collection, keyBatch);
+ if (collection == Collection.NODES) {
+ for (String key : keyBatch) {
+ invalidateCache(collection, key);
+ }
+ }
}
}
} finally {
@@ -742,7 +683,9 @@ public class MongoDocumentStore implemen
} catch (Exception e) {
throw DocumentStoreException.convert(e, "Remove failed
for " + batch);
} finally {
- invalidateCache(collection,
Lists.newArrayList(batchIds));
+ if (collection == Collection.NODES) {
+ invalidateCache(batchIds);
+ }
}
batchIds.clear();
batch.clear();
@@ -754,6 +697,7 @@ public class MongoDocumentStore implemen
return num;
}
+ @SuppressWarnings("unchecked")
@CheckForNull
private <T extends Document> T findAndModify(Collection<T> collection,
UpdateOp updateOp,
@@ -764,16 +708,17 @@ public class MongoDocumentStore implemen
updateOp = updateOp.copy();
DBObject update = createUpdate(updateOp);
- TreeLock lock = acquire(updateOp.getId());
+ Lock lock = null;
+ if (collection == Collection.NODES) {
+ lock = nodeLocks.acquire(updateOp.getId());
+ }
final long start = PERFLOG.start();
try {
// get modCount of cached document
Number modCount = null;
T cachedDoc = null;
if (collection == Collection.NODES) {
- @SuppressWarnings("unchecked")
- T doc = (T) nodesCache.getIfPresent(new
StringValue(updateOp.getId()));
- cachedDoc = doc;
+ cachedDoc = (T) nodesCache.getIfPresent(updateOp.getId());
if (cachedDoc != null) {
modCount = cachedDoc.getModCount();
}
@@ -790,7 +735,10 @@ public class MongoDocumentStore implemen
WriteResult result = dbCollection.update(query.get(), update);
if (result.getN() > 0) {
// success, update cached document
- putToCache(collection, cachedDoc, updateOp);
+ if (collection == Collection.NODES) {
+ NodeDocument newDoc = (NodeDocument)
applyChanges(collection, cachedDoc, updateOp);
+ nodesCache.put(newDoc);
+ }
// return previously cached document
return cachedDoc;
}
@@ -805,13 +753,16 @@ public class MongoDocumentStore implemen
}
T oldDoc = convertFromDBObject(collection, oldNode);
if (oldDoc != null) {
- putToCache(collection, oldDoc, updateOp);
+ if (collection == Collection.NODES) {
+ NodeDocument newDoc = (NodeDocument)
applyChanges(collection, oldDoc, updateOp);
+ nodesCache.put(newDoc);
+ }
oldDoc.seal();
} else if (upsert) {
if (collection == Collection.NODES) {
NodeDocument doc = (NodeDocument)
collection.newDocument(this);
UpdateUtils.applyChanges(doc, updateOp);
- addToCache(doc);
+ nodesCache.putIfAbsent(doc);
}
} else {
// updateOp without conditions and not an upsert
@@ -821,7 +772,9 @@ public class MongoDocumentStore implemen
} catch (Exception e) {
throw DocumentStoreException.convert(e);
} finally {
- lock.unlock();
+ if (lock != null) {
+ lock.unlock();
+ }
PERFLOG.end(start, 1, "findAndModify [{}]", updateOp.getId());
}
}
@@ -920,12 +873,7 @@ public class MongoDocumentStore implemen
}
if (collection == Collection.NODES) {
for (T doc : docs) {
- TreeLock lock = acquire(doc.getId());
- try {
- addToCache((NodeDocument) doc);
- } finally {
- lock.unlock();
- }
+ nodesCache.putIfAbsent((NodeDocument) doc);
}
}
return true;
@@ -954,7 +902,7 @@ public class MongoDocumentStore implemen
if (collection == Collection.NODES) {
cachedDocs = Maps.newHashMap();
for (String key : keys) {
- cachedDocs.put(key, nodesCache.getIfPresent(new
StringValue(key)));
+ cachedDocs.put(key, nodesCache.getIfPresent(key));
}
}
try {
@@ -965,14 +913,16 @@ public class MongoDocumentStore implemen
if (collection == Collection.NODES) {
// update cache
for (Entry<String, NodeDocument> entry :
cachedDocs.entrySet()) {
- TreeLock lock = acquire(entry.getKey());
+ // the cachedDocs is not empty, so the collection =
NODES
+ Lock lock = nodeLocks.acquire(entry.getKey());
try {
- if (entry.getValue() == null
- || entry.getValue() == NodeDocument.NULL) {
- // make sure concurrently loaded document is
invalidated
- nodesCache.invalidate(new
StringValue(entry.getKey()));
+ if (entry.getValue() == null || entry.getValue()
== NodeDocument.NULL) {
+ // make sure concurrently loaded document is
+ // invalidated
+ nodesCache.invalidate(entry.getKey());
} else {
- updateCache(Collection.NODES,
entry.getValue(), updateOp.shallowCopy(entry.getKey()));
+ NodeDocument newDoc =
applyChanges(Collection.NODES, entry.getValue(),
updateOp.shallowCopy(entry.getKey()));
+
nodesCache.replaceCachedDocument(entry.getValue(), newDoc);
}
} finally {
lock.unlock();
@@ -1021,7 +971,7 @@ public class MongoDocumentStore implemen
ReadPreference readPreference = ReadPreference.primary();
if (parentId != null) {
long replicationSafeLimit = getTime() -
maxReplicationLagMillis;
- NodeDocument cachedDoc = (NodeDocument)
getIfCached(collection, parentId);
+ NodeDocument cachedDoc = nodesCache.getIfPresent(parentId);
// FIXME: this is not quite accurate, because ancestors
// are updated in a background thread (_lastRev). We
// will need to revise this for low maxReplicationLagMillis
@@ -1105,20 +1055,16 @@ public class MongoDocumentStore implemen
@Override
public void dispose() {
nodes.getDB().getMongo().close();
-
- if (nodesCache instanceof Closeable) {
- try {
- ((Closeable) nodesCache).close();
- } catch (IOException e) {
-
- LOG.warn("Error occurred while closing Off Heap Cache", e);
- }
+ try {
+ nodesCache.close();
+ } catch (IOException e) {
+ LOG.warn("Error occurred while closing Off Heap Cache", e);
}
}
@Override
public CacheStats getCacheStats() {
- return cacheStats;
+ return nodesCache.getCacheStats();
}
@Override
@@ -1134,18 +1080,6 @@ public class MongoDocumentStore implemen
return disableIndexHint;
}
- Iterable<? extends Map.Entry<CacheValue, ? extends CachedNodeDocument>>
getCacheEntries() {
- return nodesCache.asMap().entrySet();
- }
-
- CachedNodeDocument getCachedNodeDoc(String id) {
- return nodesCache.getIfPresent(new StringValue(id));
- }
-
- protected Cache<CacheValue, NodeDocument> getNodeDocumentCache() {
- return nodesCache;
- }
-
private static void log(String message, Object... args) {
if (LOG.isDebugEnabled()) {
String argList = Arrays.toString(args);
@@ -1162,124 +1096,10 @@ public class MongoDocumentStore implemen
return null;
}
@SuppressWarnings("unchecked")
- T doc = (T) nodesCache.getIfPresent(new StringValue(key));
+ T doc = (T) nodesCache.getIfPresent(key);
return doc;
}
- /**
- * Applies an update to the nodes cache. This method does not acquire
- * a lock for the document. The caller must ensure it holds a lock for
- * the updated document. See striped {@link #locks}.
- *
- * @param <T> the document type.
- * @param collection the document collection.
- * @param oldDoc the old document.
- * @param updateOp the update operation.
- */
- private <T extends Document> void updateCache(@Nonnull Collection<T>
collection,
- @Nonnull T oldDoc,
- @Nonnull UpdateOp updateOp) {
- // cache the new document
- if (collection == Collection.NODES) {
- checkNotNull(oldDoc);
- checkNotNull(updateOp);
- // we can only update the cache based on the oldDoc if we
- // still have the oldDoc in the cache, otherwise we may
- // update the cache with an outdated document
- CacheValue key = new StringValue(updateOp.getId());
- NodeDocument cached = nodesCache.getIfPresent(key);
- if (cached == null) {
- // cannot use oldDoc to update cache
- return;
- }
-
- // check if the currently cached document matches oldDoc
- if (Objects.equal(cached.getModCount(), oldDoc.getModCount())) {
- NodeDocument newDoc = (NodeDocument)
collection.newDocument(this);
- oldDoc.deepCopy(newDoc);
-
- UpdateUtils.applyChanges(newDoc, updateOp);
- newDoc.seal();
-
- nodesCache.put(key, newDoc);
- } else {
- // the cache entry was modified by some other thread in
- // the meantime. the updated cache entry may or may not
- // include this update. we cannot just apply our update
- // on top of the cached entry.
- // therefore we must invalidate the cache entry
- nodesCache.invalidate(key);
- }
- }
- }
-
- /**
- * Adds a document to the {@link #nodesCache} iff there is no document
- * in the cache with the document key. This method does not acquire a lock
- * from {@link #locks}! The caller must ensure a lock is held for the
- * given document.
- *
- * @param doc the document to add to the cache.
- * @return either the given <code>doc</code> or the document already
present
- * in the cache.
- */
- @Nonnull
- private NodeDocument addToCache(@Nonnull final NodeDocument doc) {
- if (doc == NodeDocument.NULL) {
- throw new IllegalArgumentException("doc must not be NULL
document");
- }
- doc.seal();
- // make sure we only cache the document if it wasn't
- // changed and cached by some other thread in the
- // meantime. That is, use get() with a Callable,
- // which is only used when the document isn't there
- try {
- CacheValue key = new StringValue(doc.getId());
- for (;;) {
- NodeDocument cached = nodesCache.get(key,
- new Callable<NodeDocument>() {
- @Override
- public NodeDocument call() {
- return doc;
- }
- });
- if (cached != NodeDocument.NULL) {
- return cached;
- } else {
- nodesCache.invalidate(key);
- }
- }
- } catch (ExecutionException e) {
- // will never happen because call() just returns
- // the already available doc
- throw new IllegalStateException(e);
- }
- }
-
- /**
- * Unconditionally puts a document into the cache if {@code collection} is
- * {@link Collection#NODES}. The document put into the cache is
- * {@code oldDoc} with the {@code updateOp} applied. This method does not
- * acquire a lock from {@link #locks}! The caller must ensure a lock is
held
- * for the given document.
- *
- * @param collection the collection where oldDoc belongs to.
- * @param oldDoc how the document looked before the update.
- * @param updateOp the update just applied to the document.
- */
- private <T extends Document> void putToCache(@Nonnull Collection<T>
collection,
- @Nonnull T oldDoc,
- @Nonnull UpdateOp updateOp) {
- if (collection == Collection.NODES) {
- CacheValue key = new StringValue(oldDoc.getId());
- NodeDocument newDoc = (NodeDocument) collection.newDocument(this);
- oldDoc.deepCopy(newDoc);
- UpdateUtils.applyChanges(newDoc, updateOp);
- newDoc.seal();
- nodesCache.put(key, newDoc);
- }
- }
-
@Nonnull
private static QueryBuilder createQueryForUpdate(String key,
Map<Key, Condition>
conditions) {
@@ -1366,44 +1186,13 @@ public class MongoDocumentStore implemen
return update;
}
- /**
- * Returns the parent id for the given id. An empty String is returned if
- * the given value is the id of the root document or the id for a long
path.
- *
- * @param id an id for a document.
- * @return the id of the parent document or the empty String.
- */
@Nonnull
- private static String getParentId(@Nonnull String id) {
- String parentId = Utils.getParentId(checkNotNull(id));
- if (parentId == null) {
- parentId = "";
- }
- return parentId;
- }
-
- /**
- * Acquires a log for the given key. The returned tree lock will also hold
- * a shared lock on the parent key.
- *
- * @param key a key.
- * @return the acquired lock for the given key.
- */
- private TreeLock acquire(String key) {
- lockAcquisitionCounter.incrementAndGet();
- return TreeLock.shared(parentLocks.get(getParentId(key)),
locks.get(key));
- }
-
- /**
- * Acquires an exclusive lock on the given parent key. Use this method to
- * block cache access for child keys of the given parent key.
- *
- * @param parentKey the parent key.
- * @return the acquired lock for the given parent key.
- */
- private TreeLock acquireExclusive(String parentKey) {
- lockAcquisitionCounter.incrementAndGet();
- return TreeLock.exclusive(parentLocks.get(parentKey));
+ private <T extends Document> T applyChanges(Collection<T> collection, T
oldDoc, UpdateOp update) {
+ T doc = collection.newDocument(this);
+ oldDoc.deepCopy(doc);
+ UpdateUtils.applyChanges(doc, update);
+ doc.seal();
+ return doc;
}
@Override
@@ -1447,42 +1236,16 @@ public class MongoDocumentStore implemen
this.maxLockedQueryTimeMS = maxLockedQueryTimeMS;
}
- long getLockAcquisitionCount() {
- return lockAcquisitionCounter.get();
+ void resetLockAcquisitionCount() {
+ nodeLocks.resetLockAcquisitionCount();
}
- private final static class TreeLock {
-
- private final Lock parentLock;
- private final Lock lock;
-
- private TreeLock(Lock parentLock, Lock lock) {
- this.parentLock = parentLock;
- this.lock = lock;
- }
-
- static TreeLock shared(ReadWriteLock parentLock, Lock lock) {
- return new TreeLock(parentLock.readLock(), lock).lock();
- }
-
- static TreeLock exclusive(ReadWriteLock parentLock) {
- return new TreeLock(parentLock.writeLock(), null).lock();
- }
-
- private TreeLock lock() {
- parentLock.lock();
- if (lock != null) {
- lock.lock();
- }
- return this;
- }
+ long getLockAcquisitionCount() {
+ return nodeLocks.getLockAcquisitionCount();
+ }
- private void unlock() {
- if (lock != null) {
- lock.unlock();
- }
- parentLock.unlock();
- }
+ NodeDocumentCache getNodeDocumentCache() {
+ return nodesCache;
}
@Override
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=1725751&r1=1725750&r2=1725751&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
Wed Jan 20 16:25:36 2016
@@ -58,7 +58,6 @@ import javax.annotation.Nonnull;
import javax.sql.DataSource;
import org.apache.jackrabbit.oak.cache.CacheStats;
-import org.apache.jackrabbit.oak.cache.CacheValue;
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.Document;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
@@ -71,21 +70,20 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Operation;
import org.apache.jackrabbit.oak.plugins.document.UpdateUtils;
import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats;
+import org.apache.jackrabbit.oak.plugins.document.cache.NodeDocumentCache;
+import org.apache.jackrabbit.oak.plugins.document.locks.NodeDocumentLocks;
+import
org.apache.jackrabbit.oak.plugins.document.locks.StripedNodeDocumentLocks;
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
-import org.apache.jackrabbit.oak.plugins.document.util.StringValue;
import org.apache.jackrabbit.oak.util.OakVersion;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Objects;
-import com.google.common.cache.Cache;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.hash.BloomFilter;
import com.google.common.hash.Funnel;
import com.google.common.hash.PrimitiveSink;
-import com.google.common.util.concurrent.Striped;
/**
* Implementation of {@link DocumentStore} for relational databases.
@@ -311,6 +309,7 @@ public class RDBDocumentStore implements
}
return null;
}
+
@Override
public CacheInvalidationStats invalidateCache(Iterable<String> keys) {
//TODO: optimize me
@@ -322,22 +321,6 @@ public class RDBDocumentStore implements
invalidateCache(collection, id, false);
}
- @Override
- public long determineServerTimeDifferenceMillis() {
- Connection connection = null;
- try {
- connection = this.ch.getROConnection();
- long result =
this.db.determineServerTimeDifferenceMillis(connection);
- connection.commit();
- return result;
- } catch (SQLException ex) {
- LOG.error("Trying to determine time difference to server", ex);
- throw new DocumentStoreException(ex);
- } finally {
- this.ch.closeConnection(connection);
- }
- }
-
private <T extends Document> void invalidateCache(Collection<T>
collection, String id, boolean remove) {
if (collection == Collection.NODES) {
invalidateNodesCache(id, remove);
@@ -345,13 +328,12 @@ public class RDBDocumentStore implements
}
private void invalidateNodesCache(String id, boolean remove) {
- StringValue key = new StringValue(id);
- Lock lock = getAndLock(id);
+ Lock lock = locks.acquire(id);
try {
if (remove) {
- nodesCache.invalidate(key);
+ nodesCache.invalidate(id);
} else {
- NodeDocument entry = nodesCache.getIfPresent(key);
+ NodeDocument entry = nodesCache.getIfPresent(id);
if (entry != null) {
entry.markUpToDate(0);
}
@@ -361,6 +343,22 @@ public class RDBDocumentStore implements
}
}
+ @Override
+ public long determineServerTimeDifferenceMillis() {
+ Connection connection = null;
+ try {
+ connection = this.ch.getROConnection();
+ long result =
this.db.determineServerTimeDifferenceMillis(connection);
+ connection.commit();
+ return result;
+ } catch (SQLException ex) {
+ LOG.error("Trying to determine time difference to server", ex);
+ throw new DocumentStoreException(ex);
+ } finally {
+ this.ch.closeConnection(connection);
+ }
+ }
+
// used for diagnostics
private String droppedTables = "";
@@ -467,14 +465,14 @@ public class RDBDocumentStore implements
if (collection != Collection.NODES) {
return null;
} else {
- NodeDocument doc = nodesCache.getIfPresent(new StringValue(id));
+ NodeDocument doc = nodesCache.getIfPresent(id);
return castAsT(doc);
}
}
@Override
public CacheStats getCacheStats() {
- return this.cacheStats;
+ return nodesCache.getCacheStats();
}
@Override
@@ -556,8 +554,8 @@ public class RDBDocumentStore implements
this.ch = new RDBConnectionHandler(ds);
this.callStack = LOG.isDebugEnabled() ? new Exception("call stack of
RDBDocumentStore creation") : null;
- this.nodesCache = builder.buildDocumentCache(this);
- this.cacheStats = new CacheStats(nodesCache, "Document-Documents",
builder.getWeigher(), builder.getDocumentCacheSize());
+ this.locks = new StripedNodeDocumentLocks();
+ this.nodesCache = builder.buildNodeDocumentCache(this, locks);
Connection con = this.ch.getRWConnection();
@@ -880,11 +878,10 @@ public class RDBDocumentStore implements
if (collection != Collection.NODES) {
return readDocumentUncached(collection, id, null);
} else {
- CacheValue cacheKey = new StringValue(id);
NodeDocument doc = null;
if (maxCacheAge > 0) {
// first try without lock
- doc = nodesCache.getIfPresent(cacheKey);
+ doc = nodesCache.getIfPresent(id);
if (doc != null) {
long lastCheckTime = doc.getLastCheckTime();
if (lastCheckTime != 0) {
@@ -895,7 +892,7 @@ public class RDBDocumentStore implements
}
}
try {
- Lock lock = getAndLock(id);
+ Lock lock = locks.acquire(id);
try {
// caller really wants the cache to be cleared
if (maxCacheAge == 0) {
@@ -903,7 +900,7 @@ public class RDBDocumentStore implements
doc = null;
}
final NodeDocument cachedDoc = doc;
- doc = nodesCache.get(cacheKey, new
Callable<NodeDocument>() {
+ doc = nodesCache.get(id, new Callable<NodeDocument>() {
@Override
public NodeDocument call() throws Exception {
NodeDocument doc = (NodeDocument)
readDocumentUncached(collection, id, cachedDoc);
@@ -927,7 +924,7 @@ public class RDBDocumentStore implements
ndoc.seal();
}
doc = wrap(ndoc);
- nodesCache.put(cacheKey, doc);
+ nodesCache.put(doc);
}
} finally {
lock.unlock();
@@ -959,9 +956,9 @@ public class RDBDocumentStore implements
docs.add(doc);
}
boolean done = insertDocuments(collection, docs);
- if (done) {
+ if (done && collection == Collection.NODES) {
for (T doc : docs) {
- addToCache(collection, doc);
+ nodesCache.putIfAbsent((NodeDocument) doc);
}
}
else {
@@ -993,7 +990,9 @@ public class RDBDocumentStore implements
UpdateUtils.applyChanges(doc, update);
try {
insertDocuments(collection, Collections.singletonList(doc));
- addToCache(collection, doc);
+ if (collection == Collection.NODES) {
+ nodesCache.putIfAbsent((NodeDocument) doc);
+ }
return oldDoc;
} catch (DocumentStoreException ex) {
// may have failed due to a race condition; try update instead
@@ -1031,7 +1030,7 @@ public class RDBDocumentStore implements
maintainUpdateStats(collection, update.getId());
addUpdateCounters(update);
T doc = createNewDocument(collection, oldDoc, update);
- Lock l = getAndLock(update.getId());
+ Lock l = locks.acquire(update.getId());
try {
boolean success = false;
@@ -1065,7 +1064,9 @@ public class RDBDocumentStore implements
doc = createNewDocument(collection, oldDoc,
update);
}
} else {
- updateCache(collection, oldDoc, doc);
+ if (collection == Collection.NODES) {
+ nodesCache.replaceCachedDocument((NodeDocument)
oldDoc, (NodeDocument) doc);
+ }
}
}
@@ -1115,7 +1116,7 @@ public class RDBDocumentStore implements
// remember what we already have in the cache
cachedDocs = new HashMap<String, NodeDocument>();
for (String key : chunkedIds) {
- cachedDocs.put(key, nodesCache.getIfPresent(new
StringValue(key)));
+ cachedDocs.put(key, nodesCache.getIfPresent(key));
}
// keep concurrently running queries from updating
@@ -1153,16 +1154,16 @@ public class RDBDocumentStore implements
for (Entry<String, NodeDocument> entry :
cachedDocs.entrySet()) {
T oldDoc = castAsT(entry.getValue());
String id = entry.getKey();
- Lock lock = getAndLock(id);
+ Lock lock = locks.acquire(id);
try {
if (oldDoc == null) {
// make sure concurrently loaded document is
// invalidated
- nodesCache.invalidate(new StringValue(id));
+ nodesCache.invalidate(id);
} else {
addUpdateCounters(update);
T newDoc = createNewDocument(collection,
oldDoc, update);
- updateCache(collection, oldDoc, newDoc);
+
nodesCache.replaceCachedDocument((NodeDocument) oldDoc, (NodeDocument) newDoc);
}
} finally {
lock.unlock();
@@ -1607,16 +1608,9 @@ public class RDBDocumentStore implements
return (T) doc;
}
- // Memory Cache
- private Cache<CacheValue, NodeDocument> nodesCache;
- private CacheStats cacheStats;
- private final Striped<Lock> locks = Striped.lock(64);
-
- private Lock getAndLock(String key) {
- Lock l = locks.get(key);
- l.lock();
- return l;
- }
+ private NodeDocumentCache nodesCache;
+
+ private NodeDocumentLocks locks;
@CheckForNull
private static NodeDocument unwrap(@Nonnull NodeDocument doc) {
@@ -1642,100 +1636,6 @@ public class RDBDocumentStore implements
return n != null ? n.longValue() : -1;
}
- private <T extends Document> void addToCache(Collection<T> collection, T
doc) {
- if (collection == Collection.NODES) {
- Lock lock = getAndLock(idOf(doc));
- try {
- addToCache((NodeDocument) doc);
- } finally {
- lock.unlock();
- }
- }
- }
-
- /**
- * Applies an update to the nodes cache. This method does not acquire
- * a lock for the document. The caller must ensure it holds a lock for
- * the updated document. See striped {@link #locks}.
- *
- * @param <T> the document type.
- * @param collection the document collection.
- * @param oldDoc the old document.
- * @param updateOp the update operation.
- */
- private <T extends Document> void updateCache(@Nonnull Collection<T>
collection,
- @Nonnull T oldDoc,
- @Nonnull T newDoc) {
- // cache the new document
- if (collection == Collection.NODES) {
- checkNotNull(oldDoc);
- checkNotNull(newDoc);
- // we can only update the cache based on the oldDoc if we
- // still have the oldDoc in the cache, otherwise we may
- // update the cache with an outdated document
- CacheValue key = new StringValue(idOf(newDoc));
- NodeDocument cached = nodesCache.getIfPresent(key);
- if (cached == null) {
- // cannot use oldDoc to update cache
- return;
- }
-
- // check if the currently cached document matches oldDoc
- if (Objects.equal(cached.getModCount(), oldDoc.getModCount())) {
- nodesCache.put(key, (NodeDocument)newDoc);
- } else {
- // the cache entry was modified by some other thread in
- // the meantime. the updated cache entry may or may not
- // include this update. we cannot just apply our update
- // on top of the cached entry.
- // therefore we must invalidate the cache entry
- nodesCache.invalidate(key);
- }
- }
- }
-
- /**
- * Adds a document to the {@link #nodesCache} iff there is no document
- * in the cache with the document key. This method does not acquire a lock
- * from {@link #locks}! The caller must ensure a lock is held for the
- * given document.
- *
- * @param doc the document to add to the cache.
- * @return either the given <code>doc</code> or the document already
present
- * in the cache.
- */
- @Nonnull
- private NodeDocument addToCache(@Nonnull final NodeDocument doc) {
- if (doc == NodeDocument.NULL) {
- throw new IllegalArgumentException("doc must not be NULL
document");
- }
- doc.seal();
- // make sure we only cache the document if it wasn't
- // changed and cached by some other thread in the
- // meantime. That is, use get() with a Callable,
- // which is only used when the document isn't there
- try {
- CacheValue key = new StringValue(idOf(doc));
- for (;;) {
- NodeDocument cached = nodesCache.get(key, new
Callable<NodeDocument>() {
- @Override
- public NodeDocument call() {
- return doc;
- }
- });
- if (cached != NodeDocument.NULL) {
- return cached;
- } else {
- nodesCache.invalidate(key);
- }
- }
- } catch (ExecutionException e) {
- // will never happen because call() just returns
- // the already available doc
- throw new IllegalStateException(e);
- }
- }
-
@Nonnull
protected <T extends Document> T convertFromDBObject(@Nonnull
Collection<T> collection, @Nonnull RDBRow row) {
// this method is present here in order to facilitate unit testing for
OAK-3566
@@ -1750,8 +1650,7 @@ public class RDBDocumentStore implements
}
String id = row.getId();
- CacheValue cacheKey = new StringValue(id);
- NodeDocument inCache = nodesCache.getIfPresent(cacheKey);
+ NodeDocument inCache = nodesCache.getIfPresent(id);
Number modCount = row.getModcount();
// do not overwrite document in cache if the
@@ -1776,26 +1675,7 @@ public class RDBDocumentStore implements
return castAsT(fresh);
}
- Lock lock = getAndLock(id);
- try {
- inCache = nodesCache.getIfPresent(cacheKey);
- if (inCache != null && inCache != NodeDocument.NULL) {
- // check mod count
- Number cachedModCount = inCache.getModCount();
- if (cachedModCount == null) {
- throw new IllegalStateException("Missing " +
Document.MOD_COUNT);
- }
- if (modCount.longValue() > cachedModCount.longValue()) {
- nodesCache.put(cacheKey, fresh);
- } else {
- fresh = inCache;
- }
- } else {
- nodesCache.put(cacheKey, fresh);
- }
- } finally {
- lock.unlock();
- }
+ nodesCache.putIfNewer(fresh);
return castAsT(fresh);
}
@@ -1844,7 +1724,7 @@ public class RDBDocumentStore implements
}
}
- protected Cache<CacheValue, NodeDocument> getNodeDocumentCache() {
+ protected NodeDocumentCache getNodeDocumentCache() {
return nodesCache;
}
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheConsistencyIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheConsistencyIT.java?rev=1725751&r1=1725750&r2=1725751&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheConsistencyIT.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheConsistencyIT.java
Wed Jan 20 16:25:36 2016
@@ -20,17 +20,15 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import com.google.common.cache.Cache;
import com.google.common.collect.Lists;
import com.mongodb.DB;
-import org.apache.jackrabbit.oak.cache.CacheValue;
import org.apache.jackrabbit.oak.plugins.document.AbstractMongoConnectionTest;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp;
-import org.apache.jackrabbit.oak.plugins.document.util.StringValue;
+import org.apache.jackrabbit.oak.plugins.document.cache.NodeDocumentCache;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.junit.Before;
import org.junit.Test;
@@ -145,18 +143,17 @@ public class CacheConsistencyIT extends
}, "reader");
t3.start();
- Cache<CacheValue, NodeDocument> cache = store.getNodeDocumentCache();
+ NodeDocumentCache cache = store.getNodeDocumentCache();
// run for at most five seconds
long end = System.currentTimeMillis() + 1000;
String id = Utils.getIdFromPath("/test/foo");
- CacheValue key = new StringValue(id);
while (t1.isAlive() && t2.isAlive() && t3.isAlive()
&& System.currentTimeMillis() < end) {
- if (cache.getIfPresent(key) != null) {
+ if (cache.getIfPresent(id) != null) {
Thread.sleep(0, (int) (Math.random() * 100));
// simulate eviction
- cache.invalidate(key);
+ cache.invalidate(id);
}
}
for (Throwable e : exceptions) {
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java?rev=1725751&r1=1725750&r2=1725751&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java
Wed Jan 20 16:25:36 2016
@@ -19,8 +19,6 @@
package org.apache.jackrabbit.oak.plugins.document.mongo;
-import com.google.common.collect.Iterables;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.plugins.document.AbstractMongoConnectionTest;
@@ -47,7 +45,6 @@ public class CacheInvalidationIT extends
private DocumentNodeStore c1;
private DocumentNodeStore c2;
private int initialCacheSizeC1;
- private int initialCacheSizeC2;
@Before
public void prepareStores() throws Exception {
@@ -56,7 +53,6 @@ public class CacheInvalidationIT extends
c1 = createNS(2);
c2 = createNS(3);
initialCacheSizeC1 = getCurrentCacheSize(c1);
- initialCacheSizeC2 = getCurrentCacheSize(c2);
}
private int createScenario() throws CommitFailedException {
@@ -77,7 +73,6 @@ public class CacheInvalidationIT extends
"/a/d",
"/a/d/h",
};
- final int totalPaths = paths.length + 1; // 1 extra for root
NodeBuilder root = getRoot(c1).builder();
createTree(root, paths);
c1.merge(root, EmptyHook.INSTANCE, CommitInfo.EMPTY);
@@ -105,11 +100,9 @@ public class CacheInvalidationIT extends
//Only 2 entries /a and /a/d would be invalidated
// '/' would have been added to cache in start of backgroundRead
//itself
- assertEquals(initialCacheSizeC1+ totalPaths - 2,
Iterables.size(ds(c1).getCacheEntries()));
+ assertEquals(initialCacheSizeC1 + totalPaths - 2,
ds(c1).getNodeDocumentCache().asMap().size());
}
-
-
@Test
public void testCacheInvalidationHierarchicalNotExist()
throws CommitFailedException {
@@ -148,7 +141,7 @@ public class CacheInvalidationIT extends
}
private int getCurrentCacheSize(DocumentNodeStore ds){
- return Iterables.size(ds(ds).getCacheEntries());
+ return ds(ds).getNodeDocumentCache().asMap().size();
}
private static void refreshHead(DocumentNodeStore store) {
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreTest.java?rev=1725751&r1=1725750&r2=1725751&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreTest.java
Wed Jan 20 16:25:36 2016
@@ -67,12 +67,12 @@ public class MongoDocumentStoreTest exte
}
mk.commit("/", sb.toString(), null, null);
store.queriesWithoutLock.set(0);
- long lockCount = store.getLockAcquisitionCount();
+ store.resetLockAcquisitionCount();
List<NodeDocument> docs = store.query(Collection.NODES, fromId,
toId,
"foo", System.currentTimeMillis(), Integer.MAX_VALUE);
assertTrue(docs.isEmpty());
if (store.queriesWithoutLock.get() > 0) {
- assertEquals(lockCount + 1, store.getLockAcquisitionCount());
+ assertEquals(1, store.getLockAcquisitionCount());
return;
}
}
