Author: mduerig
Date: Wed Nov 30 10:48:36 2016
New Revision: 1772010
URL: http://svn.apache.org/viewvc?rev=1772010&view=rev
Log:
OAK-5191: Deprecate stubs and fixtures related to oak-segment
Modified:
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentS3DataStoreBlobGCIT.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/LargeOperationIT.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakTarMKRepositoryStub.java
jackrabbit/oak/trunk/oak-jcr/src/test/resources/repositoryStubImpl.properties
jackrabbit/oak/trunk/oak-lucene/pom.xml
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/Console.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/HeavyWriteIT.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/fixture/SegmentFixture.java
jackrabbit/oak/trunk/oak-solr-core/pom.xml
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java
Modified:
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java?rev=1772010&r1=1772009&r2=1772010&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java
(original)
+++
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java
Wed Nov 30 10:48:36 2016
@@ -43,7 +43,7 @@ public final class FixturesHelper {
* default fixtures when no {@code nsfixtures} is provided
*/
public enum Fixture {
- DOCUMENT_NS, SEGMENT_MK, DOCUMENT_RDB, MEMORY_NS, DOCUMENT_MEM,
SEGMENT_TAR, MULTIPLEXED_SEGMENT, MULTIPLEXED_MEM
+ DOCUMENT_NS, @Deprecated SEGMENT_MK, DOCUMENT_RDB, MEMORY_NS,
DOCUMENT_MEM, SEGMENT_TAR, MULTIPLEXED_SEGMENT, MULTIPLEXED_MEM
}
private static final Set<Fixture> FIXTURES;
Modified:
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java?rev=1772010&r1=1772009&r2=1772010&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java
(original)
+++
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java
Wed Nov 30 10:48:36 2016
@@ -37,6 +37,7 @@ public class NodeStoreFixtures {
public static final NodeStoreFixture MEMORY_NS = new MemoryFixture();
+ @Deprecated
public static final NodeStoreFixture SEGMENT_MK = new SegmentFixture();
public static final NodeStoreFixture SEGMENT_TAR = new SegmentTarFixture();
Modified:
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentS3DataStoreBlobGCIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentS3DataStoreBlobGCIT.java?rev=1772010&r1=1772009&r2=1772010&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentS3DataStoreBlobGCIT.java
(original)
+++
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentS3DataStoreBlobGCIT.java
Wed Nov 30 10:48:36 2016
@@ -19,6 +19,11 @@
package org.apache.jackrabbit.oak.plugins.segment;
+import static
org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture.SEGMENT_MK;
+import static
org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture.SEGMENT_TAR;
+import static org.apache.jackrabbit.oak.commons.FixturesHelper.getFixtures;
+import static org.junit.Assume.assumeTrue;
+
import java.io.File;
import java.util.List;
import java.util.Properties;
@@ -31,10 +36,6 @@ import org.junit.After;
import org.junit.BeforeClass;
import org.junit.runners.Parameterized;
-import static
org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture.SEGMENT_MK;
-import static org.apache.jackrabbit.oak.commons.FixturesHelper.getFixtures;
-import static org.junit.Assume.assumeTrue;
-
/**
* Tests for SegmentNodeStore on S3DataStore GC
*/
@@ -60,7 +61,7 @@ public class SegmentS3DataStoreBlobGCIT
@BeforeClass
public static void assumptions() {
- assumeTrue(getFixtures().contains(SEGMENT_MK));
+ assumeTrue(getFixtures().contains(SEGMENT_MK) ||
getFixtures().contains(SEGMENT_TAR));
assumeTrue(S3DataStoreUtils.isS3Configured());
}
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/LargeOperationIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/LargeOperationIT.java?rev=1772010&r1=1772009&r2=1772010&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/LargeOperationIT.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/LargeOperationIT.java
Wed Nov 30 10:48:36 2016
@@ -27,7 +27,6 @@ import static org.junit.Assert.assertTru
import static org.junit.Assume.assumeTrue;
import java.io.File;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakTarMKRepositoryStub.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakTarMKRepositoryStub.java?rev=1772010&r1=1772009&r2=1772010&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakTarMKRepositoryStub.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakTarMKRepositoryStub.java
Wed Nov 30 10:48:36 2016
@@ -29,7 +29,9 @@ import org.apache.jackrabbit.oak.query.Q
/**
* A repository stub implementation for Oak on TarMK
+ * @deprecated Use {@link OakSegmentTarRepositoryStub} instead.
*/
+@Deprecated
public class OakTarMKRepositoryStub extends OakRepositoryStub {
private final FileStore store;
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/resources/repositoryStubImpl.properties
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/resources/repositoryStubImpl.properties?rev=1772010&r1=1772009&r2=1772010&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/resources/repositoryStubImpl.properties
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/resources/repositoryStubImpl.properties
Wed Nov 30 10:48:36 2016
@@ -14,7 +14,7 @@
# limitations under the License.
# Stub implementation class
-javax.jcr.tck.repository_stub_impl=org.apache.jackrabbit.oak.jcr.OakTarMKRepositoryStub
+javax.jcr.tck.repository_stub_impl=org.apache.jackrabbit.oak.jcr.OakSegmentTarRepositoryStub
# credential configuration
javax.jcr.tck.superuser.name=admin
Modified: jackrabbit/oak/trunk/oak-lucene/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/pom.xml?rev=1772010&r1=1772009&r2=1772010&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-lucene/pom.xml Wed Nov 30 10:48:36 2016
@@ -278,6 +278,12 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-segment-tar</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-jcr</artifactId>
<version>${project.version}</version>
<scope>test</scope>
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java?rev=1772010&r1=1772009&r2=1772010&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java
Wed Nov 30 10:48:36 2016
@@ -43,7 +43,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
-public class LuceneOakRepositoryStub extends OakTarMKRepositoryStub {
+public class LuceneOakRepositoryStub extends OakSegmentTarRepositoryStub {
public LuceneOakRepositoryStub(Properties settings)
throws RepositoryException {
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/Console.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/Console.java?rev=1772010&r1=1772009&r2=1772010&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/Console.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/Console.java
Wed Nov 30 10:48:36 2016
@@ -185,6 +185,7 @@ public class Console {
}
}
+ @Deprecated
private static class SegmentFixture implements NodeStoreFixture {
private final SegmentStore segmentStore;
private final SegmentNodeStore nodeStore;
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java?rev=1772010&r1=1772009&r2=1772010&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
Wed Nov 30 10:48:36 2016
@@ -51,7 +51,10 @@ public abstract class OakFixture {
public static final String OAK_RDB = "Oak-RDB";
public static final String OAK_RDB_DS = "Oak-RDB-DS";
+ @Deprecated
public static final String OAK_TAR = "Oak-Tar";
+
+ @Deprecated
public static final String OAK_TAR_DS = "Oak-Tar-DS";
public static final String OAK_SEGMENT_TAR = "Oak-Segment-Tar";
@@ -255,6 +258,7 @@ public abstract class OakFixture {
};
}
+ @Deprecated
public static OakFixture getTar(
final String name, final File base, final int maxFileSizeMB, final
int cacheSizeMB,
final boolean memoryMapping, final boolean useBlobStore) {
@@ -267,6 +271,7 @@ public abstract class OakFixture {
return getSegmentTar(name, base, maxFileSizeMB, cacheSizeMB,
memoryMapping, useBlobStore, 0);
}
+ @Deprecated
public static OakFixture getTar(
final String name, final File base, final int maxFileSizeMB, final int
cacheSizeMB,
final boolean memoryMapping, final boolean useBlobStore, int
dsCacheInMB) {
@@ -387,6 +392,7 @@ public abstract class OakFixture {
}
+ @Deprecated
public static class SegmentFixture extends OakFixture {
private FileStore[] stores;
private BlobStoreFixture[] blobStoreFixtures = new BlobStoreFixture[0];
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java?rev=1772010&r1=1772009&r2=1772010&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java
Wed Nov 30 10:48:36 2016
@@ -94,12 +94,14 @@ public class OakRepositoryFixture implem
dropDBAfterTest, cacheSize, true, base, fdsCacheInMB));
}
+ @Deprecated
public static RepositoryFixture getTar(File base, int maxFileSizeMB, int
cacheSizeMB,
boolean memoryMapping) {
return new OakRepositoryFixture(OakFixture
.getTar(OakFixture.OAK_TAR, base, maxFileSizeMB, cacheSizeMB,
memoryMapping, false));
}
+ @Deprecated
public static RepositoryFixture getTarWithBlobStore(File base, int
maxFileSizeMB,
int cacheSizeMB, boolean memoryMapping, int dsCacheInMB) {
return new OakRepositoryFixture(OakFixture
Modified:
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/HeavyWriteIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/HeavyWriteIT.java?rev=1772010&r1=1772009&r2=1772010&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/HeavyWriteIT.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/HeavyWriteIT.java
Wed Nov 30 10:48:36 2016
@@ -37,7 +37,6 @@ import javax.annotation.Nonnull;
import com.google.common.collect.ImmutableList;
import org.apache.jackrabbit.oak.api.Blob;
-import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.commons.FixturesHelper;
import org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture;
import org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy;
Modified:
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/fixture/SegmentFixture.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/fixture/SegmentFixture.java?rev=1772010&r1=1772009&r2=1772010&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/fixture/SegmentFixture.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/fixture/SegmentFixture.java
Wed Nov 30 10:48:36 2016
@@ -27,6 +27,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
+@Deprecated
public class SegmentFixture extends NodeStoreFixture {
private final SegmentStore store;
Modified: jackrabbit/oak/trunk/oak-solr-core/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/pom.xml?rev=1772010&r1=1772009&r2=1772010&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-solr-core/pom.xml Wed Nov 30 10:48:36 2016
@@ -120,6 +120,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-segment-tar</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-jcr</artifactId>
<version>${project.version}</version>
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java?rev=1772010&r1=1772009&r2=1772010&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java
Wed Nov 30 10:48:36 2016
@@ -37,7 +37,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.solr.util.SolrIndexInitializer;
import org.apache.solr.client.solrj.SolrServer;
-public class SolrOakRepositoryStub extends OakTarMKRepositoryStub {
+public class SolrOakRepositoryStub extends OakSegmentTarRepositoryStub {
public SolrOakRepositoryStub(Properties settings)
throws RepositoryException {
Modified:
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java?rev=1772010&r1=1772009&r2=1772010&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java
(original)
+++
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java
Wed Nov 30 10:48:36 2016
@@ -18,6 +18,8 @@
*/
package org.apache.jackrabbit.oak.plugins.segment.standby;
+import static
org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture.SEGMENT_TAR;
+import static org.apache.jackrabbit.oak.commons.FixturesHelper.getFixtures;
import static
org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils.createTmpTargetDir;
import static org.junit.Assume.assumeTrue;
@@ -66,7 +68,7 @@ public class TestBase {
@BeforeClass
public static void assumptions() {
assumeTrue(!CIHelper.travis());
- assumeTrue(FIXTURES.contains(Fixture.SEGMENT_MK));
+ assumeTrue(FIXTURES.contains(Fixture.SEGMENT_MK) ||
getFixtures().contains(SEGMENT_TAR));
}
public void setUpServerAndClient() throws Exception {
