Author: reschke
Date: Mon Oct 29 13:09:33 2018
New Revision: 1845119
URL: http://svn.apache.org/viewvc?rev=1845119&view=rev
Log:
OAK-7748: DocumentStore: test (and optionally optimize) bulk update fallback
logic (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
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 29 13:09:33 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,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157
-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840574,1841314,1841352,1842677,1843222,1843231,1843398,1843618,1843652,1843911,1844728,1844932
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157
-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840574,1841314,1841352,1842089,1842677,1843222,1843231,1843398,1843618,1843652,1843911,1844728,1844932
/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=1845119&r1=1845118&r2=1845119&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
Mon Oct 29 13:09:33 2018
@@ -422,6 +422,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));
@@ -1613,7 +1619,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.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java?rev=1845119&r1=1845118&r2=1845119&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java
Mon Oct 29 13:09:33 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();
+ }
+ }
}
