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 2017/12/28 15:26:25 UTC
svn commit: r1819429 - in /jackrabbit/oak/branches/1.4/oak-core: ./
src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBCacheConsistency2Test.java
Author: reschke
Date: Thu Dec 28 15:26:24 2017
New Revision: 1819429
URL: http://svn.apache.org/viewvc?rev=1819429&view=rev
Log:
OAK-7101: Stale documents in RDBDocumentStore cache (ported to 1.4)
(Test and fix by Marcel Reutegger - thanks!)
Modified:
jackrabbit/oak/branches/1.4/oak-core/ (props changed)
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBCacheConsistency2Test.java
Propchange: jackrabbit/oak/branches/1.4/oak-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 28 15:26:24 2017
@@ -1,5 +1,5 @@
/jackrabbit/oak/branches/1.0/oak-core:1665962
/jackrabbit/oak/branches/1.6/oak-core:1802566
/jackrabbit/oak/trunk/oak-core:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746634,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-175007
7,1750287,1750457,1750462,1750465,1750495,1750626,1750656,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1753481,1754117,1754239,1755157,1755191,1756505-1756506,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759754,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1760677,1760701,1760709,1760946,1761412,1761444,1761571,1761762,1761787,1761866,1761876,1762453,1762463,1762612,1762632,1762635,1762825,1763347,1763355-1763356,1763378,1763465,1763735,1764475,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766390,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767502,1767704,1768446,1768637,1769078,1769939-1769940,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,177
2162,1772228,1772593,1772768,1772906,1773190,1774141,1774256,1774445,1774497,1774519,1774787,1775474,1775622,1775628,1775757,1778112,1778423,1778968,1779137,1779478,1780388,1780424,1780538,1780543,1781068,1781075,1781386,1781846,1781907,1782476,1782966,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783738,1783773,1783855,1783891,1784023,1784034,1784130,1784251,1784551,1784574,1784689,1785283,1785838,1785946,1787074,1787217,1787425,1789056,1792463,1792742,1793013,1793088,1793644,1795314,1795330,1795475,1795488,1795491,1795613,1795618,1796144,1798035,1798834,1799219,1799389,1799924,1800974,1801011,1801013,1802548,1802973,1803026,1807308,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809163,1811380,1811952,1811963,1811986,1814332,1818645
-/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1815450,1815466,1818301,1818303,1818903,1818906
+/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1815450,1815466,1818301,1818303,1818903,1818906,1819421
/jackrabbit/trunk/oak-core:1345480
Modified: jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1819429&r1=1819428&r2=1819429&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Thu Dec 28 15:26:24 2017
@@ -435,61 +435,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.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBCacheConsistency2Test.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBCacheConsistency2Test.java?rev=1819429&r1=1819428&r2=1819429&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBCacheConsistency2Test.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBCacheConsistency2Test.java Thu Dec 28 15:26:24 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;