Author: reschke Date: Thu Dec 28 14:33:54 2017 New Revision: 1819427 URL: http://svn.apache.org/viewvc?rev=1819427&view=rev Log: OAK-7101: Stale documents in RDBDocumentStore cache (ported to 1.6)
(Test and fix by Marcel Reutegger - thanks!) 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 jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBCacheConsistency2Test.java Propchange: jackrabbit/oak/branches/1.6/oak-core/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 28 14:33:54 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,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789441,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,1797378,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-180395 5,1805851-1805852,1806668,1807308,1807688,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256,1811380,1811952,1811963,1811986,1814332,1818645 -/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823,1811835,1811931,1812739,1812750,1812753,1814407,1814499,1814579,1815450,1815466,1815940,1816436,1818301,1818303,1818903,1818906 +/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823,1811835,1811931,1812739,1812750,1812753,1814407,1814499,1814579,1815450,1815466,1815940,1816436,1818301,1818303,1818903,1818906,1819421 /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=1819427&r1=1819426&r2=1819427&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 Thu Dec 28 14:33:54 2017 @@ -454,61 +454,64 @@ public class RDBDocumentStore implements missingDocs.add(op.getId()); } } - for (T doc : readDocumentsUncached(collection, missingDocs).values()) { - oldDocs.put(doc.getId(), doc); - if (collection == Collection.NODES) { - nodesCache.putIfAbsent((NodeDocument) doc); - } - } + oldDocs.putAll(readDocumentsUncached(collection, missingDocs)); - List<T> docsToUpdate = new ArrayList<T>(updates.size()); - Set<String> keysToUpdate = new HashSet<String>(); - for (UpdateOp update : updates) { - String id = update.getId(); - T modifiedDoc = collection.newDocument(this); - if (oldDocs.containsKey(id)) { - oldDocs.get(id).deepCopy(modifiedDoc); - } - UpdateUtils.applyChanges(modifiedDoc, update); - docsToUpdate.add(modifiedDoc); - keysToUpdate.add(id); + CacheChangesTracker tracker = null; + if (collection == Collection.NODES) { + tracker = nodesCache.registerTracker(Sets.union(oldDocs.keySet(), missingDocs)); } - Connection connection = null; - RDBTableMetaData tmd = getTable(collection); try { - connection = this.ch.getRWConnection(); - Set<String> successfulUpdates = db.update(connection, tmd, docsToUpdate, upsert); - connection.commit(); - - Set<String> failedUpdates = Sets.difference(keysToUpdate, successfulUpdates); - oldDocs.keySet().removeAll(failedUpdates); - - if (collection == Collection.NODES) { - for (T doc : docsToUpdate) { - String id = doc.getId(); - if (successfulUpdates.contains(id)) { - if (oldDocs.containsKey(id)) { - nodesCache.replaceCachedDocument((NodeDocument) oldDocs.get(id), (NodeDocument) doc); - } else { - nodesCache.putIfAbsent((NodeDocument) doc); + List<T> docsToUpdate = new ArrayList<T>(updates.size()); + Set<String> keysToUpdate = new HashSet<String>(); + for (UpdateOp update : updates) { + String id = update.getId(); + T modifiedDoc = collection.newDocument(this); + if (oldDocs.containsKey(id)) { + oldDocs.get(id).deepCopy(modifiedDoc); + } + UpdateUtils.applyChanges(modifiedDoc, update); + docsToUpdate.add(modifiedDoc); + keysToUpdate.add(id); + } + + Connection connection = null; + RDBTableMetaData tmd = getTable(collection); + try { + connection = this.ch.getRWConnection(); + Set<String> successfulUpdates = db.update(connection, tmd, docsToUpdate, upsert); + connection.commit(); + + Set<String> failedUpdates = Sets.difference(keysToUpdate, successfulUpdates); + oldDocs.keySet().removeAll(failedUpdates); + + if (collection == Collection.NODES) { + List<NodeDocument> docsToCache = new ArrayList<>(); + for (T doc : docsToUpdate) { + if (successfulUpdates.contains(doc.getId())) { + docsToCache.add((NodeDocument) doc); } } + nodesCache.putNonConflictingDocs(tracker, docsToCache); } - } - Map<UpdateOp, T> result = new HashMap<UpdateOp, T>(); - for (UpdateOp op : updates) { - if (successfulUpdates.contains(op.getId())) { - result.put(op, oldDocs.get(op.getId())); + Map<UpdateOp, T> result = new HashMap<UpdateOp, T>(); + for (UpdateOp op : updates) { + if (successfulUpdates.contains(op.getId())) { + result.put(op, oldDocs.get(op.getId())); + } } + return result; + } catch (SQLException ex) { + this.ch.rollbackConnection(connection); + throw handleException("update failed for: " + keysToUpdate, ex, collection, keysToUpdate); + } finally { + this.ch.closeConnection(connection); } - return result; - } catch (SQLException ex) { - this.ch.rollbackConnection(connection); - throw handleException("update failed for: " + keysToUpdate, ex, collection, keysToUpdate); } finally { - this.ch.closeConnection(connection); + if (tracker != null) { + tracker.close(); + } } } Modified: jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBCacheConsistency2Test.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBCacheConsistency2Test.java?rev=1819427&r1=1819426&r2=1819427&view=diff ============================================================================== --- jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBCacheConsistency2Test.java (original) +++ jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBCacheConsistency2Test.java Thu Dec 28 14:33:54 2017 @@ -16,13 +16,17 @@ */ package org.apache.jackrabbit.oak.plugins.document.rdb; +import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES; +import static org.apache.jackrabbit.oak.plugins.document.util.Utils.getIdFromPath; +import static org.apache.jackrabbit.oak.plugins.document.util.Utils.getKeyLowerLimit; +import static org.apache.jackrabbit.oak.plugins.document.util.Utils.getKeyUpperLimit; +import static org.junit.Assert.assertEquals; + import java.util.List; import java.util.concurrent.atomic.AtomicLong; import javax.sql.DataSource; -import com.google.common.collect.Lists; - import org.apache.jackrabbit.oak.plugins.document.AbstractRDBConnectionTest; import org.apache.jackrabbit.oak.plugins.document.DocumentMK; import org.apache.jackrabbit.oak.plugins.document.DocumentStore; @@ -31,16 +35,10 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.document.UpdateOp; import org.apache.jackrabbit.oak.plugins.document.util.Utils; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; -import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES; -import static org.apache.jackrabbit.oak.plugins.document.util.Utils.getIdFromPath; -import static org.apache.jackrabbit.oak.plugins.document.util.Utils.getKeyLowerLimit; -import static org.apache.jackrabbit.oak.plugins.document.util.Utils.getKeyUpperLimit; -import static org.junit.Assert.assertEquals; +import com.google.common.collect.Lists; -@Ignore("OAK-7101") public class RDBCacheConsistency2Test extends AbstractRDBConnectionTest { private static final long CACHE_SIZE = 128 * 1024;