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 2016/05/26 11:02:38 UTC
svn commit: r1745589 - in
/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document:
AbstractRDBConnectionTest.java CacheConsistencyRDBTest.java
Author: reschke
Date: Thu May 26 11:02:38 2016
New Revision: 1745589
URL: http://svn.apache.org/viewvc?rev=1745589&view=rev
Log:
OAK-3566: avoid stale documents in RDBDocumentStore cache by keeping track of which documents got invalidated while queries were running (ported to 1.2)
Add test case CacheConsistencyRDBTest from trunk.
Added:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractRDBConnectionTest.java (with props)
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyRDBTest.java (with props)
Added: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractRDBConnectionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractRDBConnectionTest.java?rev=1745589&view=auto
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractRDBConnectionTest.java (added)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractRDBConnectionTest.java Thu May 26 11:02:38 2016
@@ -0,0 +1,99 @@
+/*
+ * 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;
+
+import java.io.Closeable;
+import java.io.File;
+import java.util.UUID;
+
+import javax.sql.DataSource;
+
+import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDataSourceFactory;
+import org.apache.jackrabbit.oak.plugins.document.rdb.RDBOptions;
+import org.apache.jackrabbit.oak.stats.Clock;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+
+/**
+ * Base class for test cases that need a {@link DataSource}
+ * to a clean test database. Tests in subclasses are automatically
+ * skipped if the configured database connection can not be created.
+ */
+public class AbstractRDBConnectionTest extends DocumentMKTestBase {
+
+ protected DataSource dataSource;
+ protected DocumentMK mk;
+
+ private static final String fname = (new File("target")).isDirectory() ? "target/" : "";
+ private static final String RAWURL = System.getProperty("rdb.jdbc-url", "jdbc:h2:file:./target/h2test");
+ protected static final String USERNAME = System.getProperty("rdb.jdbc-user", "");
+ protected static final String PASSWD = System.getProperty("rdb.jdbc-passwd", "");
+ protected static final String URL = RAWURL.replace("{fname}", fname);
+
+ @BeforeClass
+ public static void checkRDBAvailable() {
+ }
+
+ @Before
+ public void setUpConnection() throws Exception {
+ dataSource = RDBDataSourceFactory.forJdbcUrl(URL, USERNAME, PASSWD);
+ Revision.setClock(getTestClock());
+ mk = newBuilder(dataSource).open();
+ }
+
+ protected DocumentMK.Builder newBuilder(DataSource db) throws Exception {
+ RDBOptions opt = new RDBOptions().tablePrefix("T" + UUID.randomUUID().toString().replace("-", "")).dropTablesOnClose(true);
+ return new DocumentMK.Builder().clock(getTestClock()).setRDBConnection(dataSource, opt);
+ }
+
+ protected Clock getTestClock() throws InterruptedException {
+ return Clock.SIMPLE;
+ }
+
+ @After
+ public void tearDownConnection() throws Exception {
+ if (mk != null) {
+ mk.dispose();
+ }
+ if (dataSource instanceof Closeable) {
+ ((Closeable)dataSource).close();
+ }
+ Revision.resetClockToDefault();
+ }
+
+ @Override
+ protected DocumentMK getMicroKernel() {
+ return mk;
+ }
+
+ protected static byte[] readFully(DocumentMK mk, String blobId) {
+ int remaining = (int) mk.getLength(blobId);
+ byte[] bytes = new byte[remaining];
+
+ int offset = 0;
+ while (remaining > 0) {
+ int count = mk.read(blobId, offset, bytes, offset, remaining);
+ if (count < 0) {
+ break;
+ }
+ offset += count;
+ remaining -= count;
+ }
+ return bytes;
+ }
+}
Propchange: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractRDBConnectionTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractRDBConnectionTest.java
------------------------------------------------------------------------------
svn:executable = *
Added: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyRDBTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyRDBTest.java?rev=1745589&view=auto
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyRDBTest.java (added)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyRDBTest.java Thu May 26 11:02:38 2016
@@ -0,0 +1,128 @@
+/*
+ * 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;
+
+import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Map;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.sql.DataSource;
+
+import org.apache.jackrabbit.oak.plugins.document.DocumentMK.Builder;
+import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDataSourceFactory;
+import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore;
+import org.apache.jackrabbit.oak.plugins.document.rdb.RDBOptions;
+import org.apache.jackrabbit.oak.plugins.document.rdb.RDBRow;
+import org.apache.jackrabbit.oak.plugins.document.util.Utils;
+import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.google.common.collect.Maps;
+
+public class CacheConsistencyRDBTest extends AbstractRDBConnectionTest {
+
+ private TestStore store;
+
+ @Before
+ @Override
+ public void setUpConnection() throws Exception {
+ dataSource = RDBDataSourceFactory.forJdbcUrl(URL, USERNAME, PASSWD);
+ DocumentMK.Builder builder = new DocumentMK.Builder().clock(getTestClock()).setAsyncDelay(0);
+ RDBOptions opt = new RDBOptions().tablePrefix("T" + Long.toHexString(System.currentTimeMillis())).dropTablesOnClose(true);
+ store = new TestStore(dataSource, builder, opt);
+ mk = builder.setDocumentStore(store).open();
+ }
+
+ @Test
+ public void cacheConsistency() throws Exception {
+ mk.commit("/", "+\"node\":{}", null, null);
+ // add a child node. this will require an update
+ // of _lastRev on /node
+ mk.commit("/node", "+\"child\":{}", null, null);
+ // make sure the document is not cached
+ store.invalidateNodeDocument(Utils.getIdFromPath("/node"));
+
+ Thread t = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ store.query(NODES, Utils.getKeyLowerLimit("/"), Utils.getKeyUpperLimit("/"), 10);
+ }
+ }, "query");
+ // block thread when it tries to convert db objects
+ store.semaphores.put(t, new Semaphore(0));
+ t.start();
+
+ while (!store.semaphores.get(t).hasQueuedThreads()) {
+ Thread.sleep(10);
+ }
+
+ final Semaphore done = new Semaphore(0);
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ // trigger write back of _lastRevs
+ mk.runBackgroundOperations();
+ done.release();
+ }
+ }, "mkbg").start();
+
+ // wait at most one second for background thread
+ done.tryAcquire(1, TimeUnit.SECONDS);
+ store.invalidateNodeDocument(Utils.getIdFromPath("/node"));
+
+ // release thread
+ store.semaphores.get(t).release();
+ t.join();
+
+ NodeState root = mk.getNodeStore().getRoot();
+ assertTrue(root.getChildNode("node").getChildNode("child").exists());
+ }
+
+ private static final class TestStore extends RDBDocumentStore {
+
+ final Map<Thread, Semaphore> semaphores = Maps.newConcurrentMap();
+
+ public TestStore(DataSource dataSource, Builder builder, RDBOptions opt) {
+ super(dataSource, builder, opt);
+ }
+
+ @Override
+ protected <T extends Document> T convertFromDBObject(@Nonnull Collection<T> collection, @Nullable RDBRow row) {
+ Semaphore s = semaphores.get(Thread.currentThread());
+ if (s != null) {
+ s.acquireUninterruptibly();
+ }
+ try {
+ return super.convertFromDBObject(collection, row);
+ } finally {
+ if (s != null) {
+ s.release();
+ }
+ }
+ }
+
+ public void invalidateNodeDocument(String key) {
+ getNodeDocumentCache().invalidate(key);
+ }
+ }
+}
Propchange: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyRDBTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyRDBTest.java
------------------------------------------------------------------------------
svn:executable = *