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/11/08 11:42:48 UTC
svn commit: r1846132 - in /jackrabbit/oak/branches/1.6/oak-core: ./
src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java
Author: reschke
Date: Thu Nov 8 11:42:48 2018
New Revision: 1846132
URL: http://svn.apache.org/viewvc?rev=1846132&view=rev
Log:
OAK-7748: DocumentStore: test (and optionally optimize) bulk update fallback logic (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
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java
Propchange: jackrabbit/oak/branches/1.6/oak-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 8 11:42:48 2018
@@ -2,5 +2,5 @@
/jackrabbit/oak/trunk:1834823
/jackrabbit/oak/trunk/oak-blob-plugins:1819950
/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,1785652,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789441,1789534,1789925,1789940,1789987,1790006,1790013,1790069,1790077,1790079,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,1798832,1798834,1799219,1799389,1799393,1799861,1799924,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,180226
2,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809178-1809179,1809253,1809255-1809256,1811380,1811952,1811963,1811986,1814332,1818645,1821325,1821358,1821516,1830160,1840226
-/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823,1811835,1811931,1812739,1812750,1812753,1814407,1814499,1814579,1815450,1815466,1815940,1816436,1817379,1817772,1818301,1818303,1818903,1818906,1819421,1820199,1820661,1821130,1821477,1821487,1823163,1823169,1824962,1825065,1825442,1825470,1828349,1830048,1830209,1834610,1834823,1838076,1840455
+/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823,1811835,1811931,1812739,1812750,1812753,1814407,1814499,1814579,1815450,1815466,1815940,1816436,1817379,1817772,1818301,1818303,1818903,1818906,1819421,1820199,1820661,1821130,1821477,1821487,1823163,1823169,1824962,1825065,1825442,1825470,1828349,1830048,1830209,1834610,1834823,1838076,1840455,1842089
/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=1846132&r1=1846131&r2=1846132&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 Nov 8 11:42:48 2018
@@ -382,6 +382,12 @@ public class RDBDocumentStore implements
for (UpdateOp updateOp : updateOps) {
UpdateOp conflictedOp = operationsToCover.remove(updateOp.getId());
if (conflictedOp != null) {
+ if (collection == Collection.NODES) {
+ LOG.debug("update conflict on {}, invalidating cache and retrying...", updateOp.getId());
+ nodesCache.invalidate(updateOp.getId());
+ } else {
+ LOG.debug("update conflict on {}, retrying...", updateOp.getId());
+ }
results.put(conflictedOp, createOrUpdate(collection, updateOp));
} else if (duplicates.contains(updateOp)) {
results.put(updateOp, createOrUpdate(collection, updateOp));
@@ -1304,7 +1310,14 @@ public class RDBDocumentStore implements
if (lastmodcount == newmodcount) {
// cached copy did not change so it probably was
// updated by a different instance, get a fresh one
+ LOG.debug("suspect update from different instance (current modcount: {}), refetching: {}...",
+ newmodcount, update.getId());
oldDoc = readDocumentUncached(collection, update.getId(), null);
+ if (oldDoc == null) {
+ LOG.debug("after refetch: {} is gone", update.getId());
+ } else {
+ LOG.debug("after refetch: modcount for {} is {}", update.getId(), modcountOf(oldDoc));
+ }
}
}
Modified: jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java?rev=1846132&r1=1846131&r2=1846132&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java (original)
+++ jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java Thu Nov 8 11:42:48 2018
@@ -31,12 +31,18 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import org.apache.jackrabbit.oak.commons.junit.LogCustomizer;
+import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.collect.Lists;
+
+import ch.qos.logback.classic.Level;
+
public class BulkCreateOrUpdateClusterTest extends AbstractMultiDocumentStoreTest {
-
+
final Logger logger = LoggerFactory.getLogger(getClass());
public BulkCreateOrUpdateClusterTest(DocumentStoreFixture dsf) {
@@ -202,4 +208,64 @@ public class BulkCreateOrUpdateClusterTe
}
}
+ @Test
+ public void testSimpleConflictHandling() {
+ LogCustomizer logCustomizer = LogCustomizer.forLogger(RDBDocumentStore.class.getName()).enable(Level.DEBUG)
+ .contains("invalidating cache and retrying").create();
+ logCustomizer.starting();
+
+ try {
+ String id1 = this.getClass().getName() + ".testSimpleConflictHandling1";
+ String id2 = this.getClass().getName() + ".testSimpleConflictHandling2";
+ String id3 = this.getClass().getName() + ".testSimpleConflictHandling3";
+
+ removeMe.add(id1);
+ removeMe.add(id2);
+ removeMe.add(id3);
+
+ {
+ UpdateOp op1a = new UpdateOp(id1, true);
+ op1a.set("foo", 1);
+ UpdateOp op2a = new UpdateOp(id2, true);
+ op2a.set("foo", 1);
+ UpdateOp op3a = new UpdateOp(id3, true);
+ op3a.set("foo", 1);
+
+ List<NodeDocument> resulta = ds1.createOrUpdate(Collection.NODES, Lists.newArrayList(op1a, op2a, op3a));
+ assertEquals(3, resulta.size());
+ }
+
+ {
+ UpdateOp op2b = new UpdateOp(id2, false);
+ op2b.increment("foo", 1);
+ NodeDocument prev2 = ds2.createOrUpdate(Collection.NODES, op2b);
+ assertNotNull(prev2);
+ assertEquals(1L, ((Long)prev2.get("foo")).longValue());
+ }
+
+ {
+ UpdateOp op1c = new UpdateOp(id1, true);
+ op1c.increment("foo", 1);
+ UpdateOp op2c = new UpdateOp(id2, true);
+ op2c.increment("foo", 1);
+ UpdateOp op3c = new UpdateOp(id3, true);
+ op3c.increment("foo", 1);
+
+ List<NodeDocument> resultc = ds1.createOrUpdate(Collection.NODES, Lists.newArrayList(op1c, op2c, op3c));
+ assertEquals(3, resultc.size());
+ for (NodeDocument d : resultc) {
+ Long fooval = (Long) d.get("foo");
+ assertEquals((d.getId().equals(id2)) ? 2L : 1L, fooval.longValue());
+ }
+ }
+
+ if (ds1 instanceof RDBDocumentStore) {
+ // for RDB, verify that the cache invalidation was reached
+ assertEquals(1, logCustomizer.getLogs().size());
+ }
+ }
+ finally {
+ logCustomizer.finished();
+ }
+ }
}