Author: reschke
Date: Mon Oct 9 15:03:39 2017
New Revision: 1811579
URL: http://svn.apache.org/viewvc?rev=1811579&view=rev
Log:
OAK-6782: RDBDocumentStore: inconsistent handling of cache invalidation on
remove() (ported to 1.6)
Modified:
jackrabbit/oak/branches/1.6/oak-core/ (props changed)
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Propchange: jackrabbit/oak/branches/1.6/oak-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 9 15:03:39 2017
@@ -1,4 +1,4 @@
/jackrabbit/oak/branches/1.0/oak-core:1665962
/jackrabbit/oak/trunk/oak-core:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1790382,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1798035,1798834,1799219,1799389,1799393,1799924,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1805851-1805852,180666
8,1807308,1807688,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256
-/jackrabbit/oak/trunk/oak-store-document:1809866
+/jackrabbit/oak/trunk/oak-store-document:1809866,1811575
/jackrabbit/trunk/oak-core:1345480
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1811579&r1=1811578&r2=1811579&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Mon Oct 9 15:03:39 2017
@@ -259,26 +259,33 @@ public class RDBDocumentStore implements
@Override
public <T extends Document> void remove(Collection<T> collection, String
id) {
- delete(collection, id);
- invalidateCache(collection, id, true);
+ try {
+ delete(collection, id);
+ } finally {
+ invalidateCache(collection, id, true);
+ }
}
@Override
public <T extends Document> void remove(Collection<T> collection,
List<String> ids) {
- for (String id : ids) {
- invalidateCache(collection, id, true);
+ try {
+ delete(collection, ids);
+ } finally {
+ for (String id : ids) {
+ invalidateCache(collection, id, true);
+ }
}
- delete(collection, ids);
}
@Override
- public <T extends Document> int remove(Collection<T> collection,
- Map<String, Map<Key, Condition>>
toRemove) {
- int num = delete(collection, toRemove);
- for (String id : toRemove.keySet()) {
- invalidateCache(collection, id, true);
+ public <T extends Document> int remove(Collection<T> collection,
Map<String, Map<Key, Condition>> toRemove) {
+ try {
+ return delete(collection, toRemove);
+ } finally {
+ for (String id : toRemove.keySet()) {
+ invalidateCache(collection, id, true);
+ }
}
- return num;
}
@Override
