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 2018/05/23 17:40:30 UTC
svn commit: r1832113 - in /jackrabbit/oak/branches/1.8: ./
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Author: reschke
Date: Wed May 23 17:40:30 2018
New Revision: 1832113
URL: http://svn.apache.org/viewvc?rev=1832113&view=rev
Log:
OAK-7159: RDBDocumentStore: use try-with-resources for nodes cache locks (ported to 1.8)
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 23 17:40:30 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821665,1821668,1821681,1822121,1822201,1822207,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1824196,1824198,1824962,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1829569,1829987,1830019,1830160,1830748,1831374
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821665,1821668,1821681,1822121,1822201,1822207,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1824196,1824198,1824962,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1829569,1829987,1830019,1830160,1830748,1831374
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1832113&r1=1832112&r2=1832113&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Wed May 23 17:40:30 2018
@@ -587,8 +587,7 @@ public class RDBDocumentStore implements
}
private void invalidateNodesCache(String id, boolean remove) {
- Lock lock = locks.acquire(id);
- try {
+ try (CacheLock lock = acquireLockFor(id)) {
if (remove) {
nodesCache.invalidate(id);
} else {
@@ -598,8 +597,6 @@ public class RDBDocumentStore implements
entry.markUpToDate(0);
}
}
- } finally {
- lock.unlock();
}
}
@@ -1374,8 +1371,7 @@ public class RDBDocumentStore implements
}
}
try {
- Lock lock = locks.acquire(id);
- try {
+ try (CacheLock lock = acquireLockFor(id)) {
// caller really wants the cache to be cleared
if (maxCacheAge == 0) {
invalidateNodesCache(id, true);
@@ -1408,8 +1404,6 @@ public class RDBDocumentStore implements
doc = wrap(ndoc);
nodesCache.put(doc);
}
- } finally {
- lock.unlock();
}
return castAsT(unwrap(doc));
} catch (ExecutionException e) {
@@ -1523,12 +1517,10 @@ public class RDBDocumentStore implements
maintainUpdateStats(collection, update.getId());
addUpdateCounters(update);
T doc = createNewDocument(collection, oldDoc, update);
- Lock l = locks.acquire(update.getId());
final Stopwatch watch = startWatch();
boolean success = false;
int retries = maxRetries;
- try {
-
+ try (CacheLock lock = acquireLockFor(update.getId())) {
while (!success && retries > 0) {
long lastmodcount = modcountOf(oldDoc);
success = updateDocument(collection, doc, update, lastmodcount);
@@ -1571,7 +1563,6 @@ public class RDBDocumentStore implements
return oldDoc;
} finally {
- l.unlock();
int numOfAttempts = maxRetries - retries - 1;
stats.doneFindAndModify(watch.elapsed(TimeUnit.NANOSECONDS), collection,
update.getId(), false, success, numOfAttempts);
@@ -1642,14 +1633,11 @@ public class RDBDocumentStore implements
// and a tracker is present
long lastmodified = modifiedOf(doc);
if (lastmodified == row.getModified() && lastmodified >= 1) {
- Lock lock = locks.acquire(row.getId());
- try {
+ try (CacheLock lock = acquireLockFor(row.getId())) {
if (!tracker.mightBeenAffected(row.getId())) {
// otherwise mark it as fresh
((NodeDocument) doc).markUpToDate(now);
}
- } finally {
- lock.unlock();
}
}
else {
@@ -2233,6 +2221,24 @@ public class RDBDocumentStore implements
}
}
+ private CacheLock acquireLockFor(String id) {
+ return new CacheLock(this.locks, id);
+ }
+
+ private static class CacheLock implements AutoCloseable {
+
+ private final Lock lock;
+
+ public CacheLock(NodeDocumentLocks locks, String id) {
+ this.lock = locks.acquire(id);
+ }
+
+ @Override
+ public void close() {
+ lock.unlock();
+ }
+ }
+
// slightly extended query support
protected static class QueryCondition {