Author: reschke
Date: Wed May 15 20:25:46 2019
New Revision: 1859333
URL: http://svn.apache.org/viewvc?rev=1859333&view=rev
Log:
OAK-8002: RDBDocumentStore: add RDB-specific MissingLastRevSeeker (ported to
1.10)
Added:
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBMissingLastRevSeeker.java
- copied unchanged from r1852135,
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBMissingLastRevSeeker.java
Modified:
jackrabbit/oak/branches/1.10/ (props changed)
jackrabbit/oak/branches/1.10/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RecoveryCommand.java
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java
jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MissingLastRevSeekerTest.java
jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreTest.java
Propchange: jackrabbit/oak/branches/1.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 15 20:25:46 2019
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853083,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1855993,1856049,1856056,1856538,1856545,1857000,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314,1857577,1857635,1857638,1857640,1857687,1857936,1858032,1858053,1858123,1858139,1858571,1858578,1858810,1858931
+/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853083,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1855993,1856049,1856056,1856538,1856545,1857000,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314,1857577,1857635,1857638,1857640,1857687,1857936,1858032,1858053,1858123,1858139,1858571,1858578,1858810,1858931
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.10/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RecoveryCommand.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RecoveryCommand.java?rev=1859333&r1=1859332&r2=1859333&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.10/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RecoveryCommand.java
(original)
+++
jackrabbit/oak/branches/1.10/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RecoveryCommand.java
Wed May 15 20:25:46 2019
@@ -31,6 +31,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
import
org.apache.jackrabbit.oak.plugins.document.mongo.MongoMissingLastRevSeeker;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore;
+import org.apache.jackrabbit.oak.plugins.document.rdb.RDBMissingLastRevSeeker;
import org.apache.jackrabbit.oak.plugins.document.util.MapDBMapFactory;
import org.apache.jackrabbit.oak.plugins.document.util.MapFactory;
import org.apache.jackrabbit.oak.run.commons.Command;
@@ -74,7 +75,7 @@ class RecoveryCommand implements Command
} else if (ds instanceof RDBDocumentStore) {
RDBDocumentStore docStore = (RDBDocumentStore) ds;
agent = new LastRevRecoveryAgent(docStore, dns);
- seeker = new MissingLastRevSeeker(docStore, dns.getClock());
+ seeker = new RDBMissingLastRevSeeker(docStore, dns.getClock());
}
if (agent == null || seeker == null) {
Modified:
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java?rev=1859333&r1=1859332&r2=1859333&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java
(original)
+++
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java
Wed May 15 20:25:46 2019
@@ -24,6 +24,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreBuilder;
import org.apache.jackrabbit.oak.plugins.document.DocumentStore;
+import org.apache.jackrabbit.oak.plugins.document.MissingLastRevSeeker;
import org.apache.jackrabbit.oak.plugins.document.VersionGCSupport;
import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore;
@@ -98,4 +99,13 @@ public class RDBDocumentNodeStoreBuilder
return super.createReferencedBlobs(ns);
}
}
+
+ public MissingLastRevSeeker createMissingLastRevSeeker() {
+ final DocumentStore store = getDocumentStore();
+ if (store instanceof RDBDocumentStore) {
+ return new RDBMissingLastRevSeeker((RDBDocumentStore) store,
getClock());
+ } else {
+ return super.createMissingLastRevSeeker();
+ }
+ }
}
Modified:
jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MissingLastRevSeekerTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MissingLastRevSeekerTest.java?rev=1859333&r1=1859332&r2=1859333&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MissingLastRevSeekerTest.java
(original)
+++
jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MissingLastRevSeekerTest.java
Wed May 15 20:25:46 2019
@@ -22,6 +22,8 @@ import com.google.common.collect.Iterabl
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
import
org.apache.jackrabbit.oak.plugins.document.mongo.MongoMissingLastRevSeeker;
+import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore;
+import org.apache.jackrabbit.oak.plugins.document.rdb.RDBMissingLastRevSeeker;
import org.apache.jackrabbit.oak.stats.Clock;
import org.junit.After;
import org.junit.Before;
@@ -54,6 +56,8 @@ public class MissingLastRevSeekerTest ex
store = ds;
if (dsf == DocumentStoreFixture.MONGO) {
seeker = new MongoMissingLastRevSeeker((MongoDocumentStore) store,
clock);
+ } else if (store instanceof RDBDocumentStore) {
+ seeker = new RDBMissingLastRevSeeker((RDBDocumentStore) store,
clock);
} else {
seeker = new MissingLastRevSeeker(store, clock);
}
Modified:
jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreTest.java?rev=1859333&r1=1859332&r2=1859333&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreTest.java
(original)
+++
jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreTest.java
Wed May 15 20:25:46 2019
@@ -16,8 +16,11 @@
*/
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.hamcrest.Matchers.hasItem;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
@@ -27,18 +30,25 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.apache.jackrabbit.oak.commons.junit.LogCustomizer;
import org.apache.jackrabbit.oak.plugins.document.AbstractDocumentStoreTest;
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.DocumentStoreFixture;
+import org.apache.jackrabbit.oak.plugins.document.MissingLastRevSeeker;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
+import org.apache.jackrabbit.oak.plugins.document.Revision;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp;
import
org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore.QueryCondition;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
+import org.apache.jackrabbit.oak.stats.Clock;
import org.junit.Test;
import org.slf4j.event.Level;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+
public class RDBDocumentStoreTest extends AbstractDocumentStoreTest {
public RDBDocumentStoreTest(DocumentStoreFixture dsf) {
@@ -182,4 +192,42 @@ public class RDBDocumentStoreTest extend
}
}
}
+
+ // stolen from MongoMissingLastRevSeekerTest
+ @Test
+ public void completeResult() throws Exception {
+ if (ds instanceof RDBDocumentStore) {
+ final int NUM_DOCS = 200;
+ // populate the store
+ List<UpdateOp> ops = Lists.newArrayList();
+ for (int i = 0; i < NUM_DOCS; i++) {
+ UpdateOp op = new UpdateOp(getIdFromPath("/lastRevnode-" + i),
true);
+ NodeDocument.setModified(op, new Revision(i * 5000, 0, 1));
+ ops.add(op);
+ removeMe.add(op.getId());
+ }
+ assertTrue(ds.create(NODES, ops));
+
+ Set<String> ids = Sets.newHashSet();
+ boolean updated = false;
+ MissingLastRevSeeker seeker = new
RDBMissingLastRevSeeker((RDBDocumentStore) ds, Clock.SIMPLE);
+ for (NodeDocument doc : seeker.getCandidates(0)) {
+ if (!updated) {
+ // as soon as we have the first document, update
+ // /lastRevnode-0
+ UpdateOp op = new
UpdateOp(getIdFromPath("/lastRevnode-0"), false);
+ // and push out the _modified timestamp
+ NodeDocument.setModified(op, new Revision(NUM_DOCS * 5000,
0, 1));
+ // even after the update the document matches the query
+ assertNotNull(ds.findAndUpdate(NODES, op));
+ updated = true;
+ }
+ if (doc.getPath().startsWith("/lastRevnode-")) {
+ ids.add(doc.getId());
+ }
+ }
+ // seeker must return all documents
+ assertEquals(NUM_DOCS, ids.size());
+ }
+ }
}
