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 2020/03/27 15:21:30 UTC
svn commit: r1875782 - in
/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document:
DocumentStoreFixture.java VersionGarbageCollectorIT.java
Author: reschke
Date: Fri Mar 27 15:21:30 2020
New Revision: 1875782
URL: http://svn.apache.org/viewvc?rev=1875782&view=rev
Log:
OAK-8974: VersionGarbageCollectorIT should use fixtures from AbstractDocumentStoreTest
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java?rev=1875782&r1=1875781&r2=1875782&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java Fri Mar 27 15:21:30 2020
@@ -198,6 +198,10 @@ public abstract class DocumentStoreFixtu
}
}
}
+
+ public void setRDBOptions(RDBOptions options) {
+ this.options = options;
+ }
}
public static class MongoFixture extends DocumentStoreFixture {
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java?rev=1875782&r1=1875781&r2=1875782&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java Fri Mar 27 15:21:30 2020
@@ -38,10 +38,6 @@ import static com.google.common.collect.
import static com.google.common.collect.Iterables.size;
import static java.util.concurrent.TimeUnit.HOURS;
import static java.util.concurrent.TimeUnit.MINUTES;
-import static org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture.DOCUMENT_MEM;
-import static org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture.DOCUMENT_NS;
-import static org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture.DOCUMENT_RDB;
-import static org.apache.jackrabbit.oak.commons.FixturesHelper.getFixtures;
import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.NUM_REVS_THRESHOLD;
import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.PREV_SPLIT_FACTOR;
@@ -72,7 +68,9 @@ import com.mongodb.ReadPreference;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.plugins.document.DocumentStoreFixture.RDBFixture;
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoTestUtils;
+import org.apache.jackrabbit.oak.plugins.document.rdb.RDBOptions;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
@@ -110,21 +108,7 @@ public class VersionGarbageCollectorIT {
@Parameterized.Parameters(name="{0}")
public static Collection<Object[]> fixtures() throws IOException {
- List<Object[]> fixtures = Lists.newArrayList();
- DocumentStoreFixture mongo = new DocumentStoreFixture.MongoFixture();
- if (getFixtures().contains(DOCUMENT_NS) && mongo.isAvailable()) {
- fixtures.add(new Object[] { mongo });
- }
-
- DocumentStoreFixture rdb = new DocumentStoreFixture.RDBFixture();
- if (getFixtures().contains(DOCUMENT_RDB) && rdb.isAvailable()) {
- fixtures.add(new Object[] { rdb });
- }
- if (fixtures.isEmpty() || getFixtures().contains(DOCUMENT_MEM)) {
- fixtures.add(new Object[] { new DocumentStoreFixture.MemoryFixture() });
- }
-
- return fixtures;
+ return AbstractDocumentStoreTest.fixtures();
}
@Before
@@ -133,6 +117,10 @@ public class VersionGarbageCollectorIT {
clock = new Clock.Virtual();
clock.waitUntil(System.currentTimeMillis());
Revision.setClock(clock);
+ if (fixture instanceof RDBFixture) {
+ ((RDBFixture) fixture).setRDBOptions(
+ new RDBOptions().tablePrefix("T" + Long.toHexString(System.currentTimeMillis())).dropTablesOnClose(true));
+ }
documentMKBuilder = new DocumentMK.Builder().clock(clock)
.setLeaseCheckMode(LeaseCheckMode.DISABLED)
.setDocumentStore(fixture.createDocumentStore()).setAsyncDelay(0);
@@ -149,7 +137,9 @@ public class VersionGarbageCollectorIT {
@After
public void tearDown() throws Exception {
closer.close();
- store.dispose();
+ if (store != null) {
+ store.dispose();
+ }
Revision.resetClockToDefault();
execService.shutdown();
execService.awaitTermination(1, MINUTES);