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 2019/01/25 14:12:47 UTC
svn commit: r1852135 - in /jackrabbit/oak/trunk:
oak-run/src/main/java/org/apache/jackrabbit/oak/run/
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/
oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/do...
Author: reschke
Date: Fri Jan 25 14:12:46 2019
New Revision: 1852135
URL: http://svn.apache.org/viewvc?rev=1852135&view=rev
Log:
OAK-8002: RDBDocumentStore: add RDB-specific MissingLastRevSeeker
Added:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBMissingLastRevSeeker.java (with props)
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RecoveryCommand.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MissingLastRevSeekerTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreTest.java
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RecoveryCommand.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RecoveryCommand.java?rev=1852135&r1=1852134&r2=1852135&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RecoveryCommand.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RecoveryCommand.java Fri Jan 25 14:12:46 2019
@@ -28,6 +28,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;
@@ -62,7 +63,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/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java?rev=1852135&r1=1852134&r2=1852135&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java Fri Jan 25 14:12:46 2019
@@ -16,17 +16,18 @@
*/
package org.apache.jackrabbit.oak.plugins.document.rdb;
+import static com.google.common.base.Suppliers.ofInstance;
+
import javax.sql.DataSource;
import org.apache.jackrabbit.oak.plugins.blob.ReferencedBlob;
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;
-import static com.google.common.base.Suppliers.ofInstance;
-
/**
* A builder for a {@link DocumentNodeStore} backed by a relational database.
*/
@@ -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();
+ }
+ }
}
Added: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBMissingLastRevSeeker.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBMissingLastRevSeeker.java?rev=1852135&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBMissingLastRevSeeker.java (added)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBMissingLastRevSeeker.java Fri Jan 25 14:12:46 2019
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.jackrabbit.oak.plugins.document.rdb;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.jackrabbit.oak.plugins.document.Collection;
+import org.apache.jackrabbit.oak.plugins.document.MissingLastRevSeeker;
+import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
+import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore.QueryCondition;
+import org.apache.jackrabbit.oak.plugins.document.util.CloseableIterable;
+import org.apache.jackrabbit.oak.stats.Clock;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * RDB specific version of MissingLastRevSeeker.
+ */
+public class RDBMissingLastRevSeeker extends MissingLastRevSeeker {
+ private final RDBDocumentStore store;
+
+ public RDBMissingLastRevSeeker(RDBDocumentStore store, Clock clock) {
+ super(store, clock);
+ this.store = store;
+ }
+
+ @Override
+ @NotNull
+ public Iterable<NodeDocument> getCandidates(final long startTime) {
+ List<QueryCondition> conditions = Collections
+ .singletonList(new QueryCondition(NodeDocument.MODIFIED_IN_SECS, ">=", NodeDocument.getModifiedInSecs(startTime)));
+ return store.queryAsIterable(Collection.NODES, null, null, RDBDocumentStore.EMPTY_KEY_PATTERN, conditions,
+ Integer.MAX_VALUE, null);
+ }
+}
Propchange: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBMissingLastRevSeeker.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MissingLastRevSeekerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MissingLastRevSeekerTest.java?rev=1852135&r1=1852134&r2=1852135&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MissingLastRevSeekerTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MissingLastRevSeekerTest.java Fri Jan 25 14:12: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/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreTest.java?rev=1852135&r1=1852134&r2=1852135&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreTest.java Fri Jan 25 14:12: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());
+ }
+ }
}