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 2014/11/13 00:34:35 UTC
svn commit: r1639184 - in /jackrabbit/oak/branches/1.0:
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/d...
Author: reschke
Date: Wed Nov 12 23:34:34 2014
New Revision: 1639184
URL: http://svn.apache.org/r1639184
Log:
OAK-2136 - remove RDB support from 1.0 branch
Removed:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java
jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddIT.java
jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddReferenceTest.java
jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddRemoveIT.java
jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java
jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java
jackrabbit/oak/branches/1.0/oak-parent/pom.xml
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java?rev=1639184&r1=1639183&r2=1639184&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java Wed Nov 12 23:34:34 2014
@@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import javax.sql.DataSource;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
@@ -49,8 +48,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.persistentCache.CacheType;
import org.apache.jackrabbit.oak.plugins.document.persistentCache.PersistentCache;
-import org.apache.jackrabbit.oak.plugins.document.rdb.RDBBlobStore;
-import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.util.StringValue;
import org.apache.jackrabbit.oak.stats.Clock;
import org.slf4j.Logger;
@@ -530,18 +527,6 @@ public class DocumentMK implements Micro
}
/**
- * Sets a {@link DataSource} to use for the RDB document and blob
- * stores.
- *
- * @return this
- */
- public Builder setRDBConnection(DataSource ds) {
- this.documentStore = new RDBDocumentStore(ds, this);
- this.blobStore = new RDBBlobStore(ds);
- return this;
- }
-
- /**
* Sets the persistent cache option.
*
* @return this
@@ -552,18 +537,6 @@ public class DocumentMK implements Micro
}
/**
- * Sets a {@link DataSource}s to use for the RDB document and blob
- * stores.
- *
- * @return this
- */
- public Builder setRDBConnection(DataSource documentStoreDataSource, DataSource blobStoreDataSource) {
- this.documentStore = new RDBDocumentStore(documentStoreDataSource, this);
- this.blobStore = new RDBBlobStore(blobStoreDataSource);
- return this;
- }
-
- /**
* Use the timing document store wrapper.
*
* @param timing whether to use the timing wrapper.
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java?rev=1639184&r1=1639183&r2=1639184&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java Wed Nov 12 23:34:34 2014
@@ -54,8 +54,7 @@ public abstract class AbstractDocumentSt
@Parameterized.Parameters
public static Collection<Object[]> fixtures() {
Collection<Object[]> result = new ArrayList<Object[]>();
- DocumentStoreFixture candidates[] = new DocumentStoreFixture[] { DocumentStoreFixture.MEMORY, DocumentStoreFixture.MONGO,
- DocumentStoreFixture.RDB_H2, DocumentStoreFixture.RDB_PG, DocumentStoreFixture.RDB_DB2 };
+ DocumentStoreFixture candidates[] = new DocumentStoreFixture[] { DocumentStoreFixture.MEMORY, DocumentStoreFixture.MONGO };
for (DocumentStoreFixture dsf : candidates) {
if (dsf.isAvailable()) {
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java?rev=1639184&r1=1639183&r2=1639184&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java Wed Nov 12 23:34:34 2014
@@ -21,8 +21,6 @@ import javax.sql.DataSource;
import com.mongodb.BasicDBObject;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
-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.util.MongoConnection;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,9 +32,6 @@ public abstract class DocumentStoreFixtu
private static final Logger LOG = LoggerFactory.getLogger(DocumentStoreFixture.class);
public static final DocumentStoreFixture MEMORY = new MemoryFixture();
- public static final DocumentStoreFixture RDB_H2 = new RDBFixture("RDB-H2(file)", "jdbc:h2:file:./target/ds-test", "sa", "");
- public static final DocumentStoreFixture RDB_PG = new RDBFixture("RDB-Postgres", "jdbc:postgresql:oak", "postgres", "geheim");
- public static final DocumentStoreFixture RDB_DB2 = new RDBFixture("RDB-DB2", "jdbc:db2://localhost:50000/OAK", "oak", "geheim");
public static final DocumentStoreFixture MONGO = new MongoFixture("mongodb://localhost:27017/oak");
public abstract String getName();
@@ -62,37 +57,6 @@ public abstract class DocumentStoreFixtu
}
}
- public static class RDBFixture extends DocumentStoreFixture {
-
- DocumentStore ds;
- String name;
-
- public RDBFixture(String name, String url, String username, String passwd) {
- this.name = name;
- try {
- DataSource datas = RDBDataSourceFactory.forJdbcUrl(url, username, passwd);
- this.ds = new RDBDocumentStore(datas, new DocumentMK.Builder());
- } catch (Exception ex) {
- LOG.info("Database instance not available at " + url + ", skipping tests...");
- }
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public DocumentStore createDocumentStore() {
- return ds;
- }
-
- @Override
- public boolean isAvailable() {
- return this.ds != null;
- }
- }
-
public static class MongoFixture extends DocumentStoreFixture {
public static final String DEFAULT_URI = "mongodb://localhost:27017/oak-test";
private String uri;
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java?rev=1639184&r1=1639183&r2=1639184&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java Wed Nov 12 23:34:34 2014
@@ -92,9 +92,6 @@ public abstract class AbstractRepository
if (FIXTURES.isEmpty() || FIXTURES.contains("SEGMENT_MK")) {
result.add(new Object[] { NodeStoreFixture.SEGMENT_MK });
}
- if (FIXTURES.isEmpty() || FIXTURES.contains("DOCUMENT_JDBC")) {
- result.add(new Object[] { NodeStoreFixture.DOCUMENT_JDBC });
- }
return result;
}
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddIT.java?rev=1639184&r1=1639183&r2=1639184&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddIT.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddIT.java Wed Nov 12 23:34:34 2014
@@ -77,8 +77,6 @@ public class ConcurrentAddIT extends Abs
@Test @SuppressWarnings("unchecked")
public void addNodesSameParent() throws Exception {
- // takes too long with RDBDocumentStore
- Assume.assumeTrue(fixture != NodeStoreFixture.DOCUMENT_JDBC);
List<Exception> exceptions = Collections.synchronizedList(
new ArrayList<Exception>());
// use nt:unstructured to force conflicts on :childOrder property
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddReferenceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddReferenceTest.java?rev=1639184&r1=1639183&r2=1639184&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddReferenceTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddReferenceTest.java Wed Nov 12 23:34:34 2014
@@ -76,7 +76,6 @@ public class ConcurrentAddReferenceTest
@SuppressWarnings("unchecked")
@Test
public void addReferences() throws Exception {
- Assume.assumeTrue(fixture != NodeStoreFixture.DOCUMENT_JDBC); // FIXME OAK-1472
List<Exception> exceptions = Collections.synchronizedList(new ArrayList<Exception>());
List<Thread> worker = new ArrayList<Thread>();
for (int i = 0; i < NUM_WORKERS; i++) {
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddRemoveIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddRemoveIT.java?rev=1639184&r1=1639183&r2=1639184&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddRemoveIT.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddRemoveIT.java Wed Nov 12 23:34:34 2014
@@ -47,7 +47,6 @@ public class ConcurrentAddRemoveIT exten
@Test
public void concurrent() throws Exception {
- Assume.assumeTrue(fixture != NodeStoreFixture.DOCUMENT_JDBC); // FIXME OAK-1488
List<Exception> exceptions = Collections.synchronizedList(new ArrayList<Exception>());
Node test = getAdminSession().getRootNode().addNode("test");
List<Thread> worker = new ArrayList<Thread>();
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java?rev=1639184&r1=1639183&r2=1639184&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java Wed Nov 12 23:34:34 2014
@@ -19,11 +19,7 @@
package org.apache.jackrabbit.oak.jcr;
import java.io.Closeable;
-import java.io.File;
import java.io.IOException;
-import java.util.UUID;
-
-import javax.sql.DataSource;
import com.mongodb.DB;
@@ -31,7 +27,6 @@ import org.apache.jackrabbit.mk.core.Mic
import org.apache.jackrabbit.oak.kernel.KernelNodeStore;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
-import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDataSourceFactory;
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.plugins.segment.SegmentStore;
@@ -80,34 +75,6 @@ public abstract class NodeStoreFixture {
public static final NodeStoreFixture DOCUMENT_NS = createDocumentFixture("mongodb://localhost:27017/oak");
- public static final NodeStoreFixture DOCUMENT_JDBC = new NodeStoreFixture() {
- @Override
- public NodeStore createNodeStore() {
- String id = UUID.randomUUID().toString();
- String folder = (new File("target")).isDirectory() ? "./target/" : "./";
- DataSource ds = RDBDataSourceFactory.forJdbcUrl("jdbc:h2:file:" + folder + id + ";MVCC=true", "sa", "");
- return new DocumentMK.Builder().setRDBConnection(ds).getNodeStore();
- }
-
- @Override
- public NodeStore createNodeStore(int clusterNodeId) {
- try {
- String folder = (new File("target")).isDirectory() ? "./target/" : "./";
- DataSource ds = RDBDataSourceFactory.forJdbcUrl("jdbc:h2:file:" + folder + "oaknodes-" + clusterNodeId, "sa", "");
- return new DocumentMK.Builder().setRDBConnection(ds).getNodeStore();
- } catch (Exception e) {
- return null;
- }
- }
-
- @Override
- public void dispose(NodeStore nodeStore) {
- if (nodeStore instanceof DocumentNodeStore) {
- ((DocumentNodeStore) nodeStore).dispose();
- }
- }
- };
-
public static final NodeStoreFixture MK_IMPL = new NodeStoreFixture() {
@Override
public NodeStore createNodeStore() {
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java?rev=1639184&r1=1639183&r2=1639184&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java Wed Nov 12 23:34:34 2014
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
-import org.apache.jackrabbit.oak.jcr.OakDocumentRDBRepositoryStub;
import org.apache.jackrabbit.oak.jcr.OakMongoNSRepositoryStub;
import org.apache.jackrabbit.oak.jcr.OakTarMKRepositoryStub;
import org.apache.jackrabbit.test.RepositoryHelper;
@@ -51,9 +50,6 @@ public abstract class TCKBase extends Te
if (OakMongoNSRepositoryStub.isMongoDBAvailable()) {
Setup.wrap(this, OakMongoNSRepositoryStub.class.getName());
}
- if (OakDocumentRDBRepositoryStub.isAvailable()) {
- Setup.wrap(this, OakDocumentRDBRepositoryStub.class.getName());
- }
}
abstract protected void addTests();
Modified: jackrabbit/oak/branches/1.0/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-parent/pom.xml?rev=1639184&r1=1639183&r2=1639184&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-parent/pom.xml (original)
+++ jackrabbit/oak/branches/1.0/oak-parent/pom.xml Wed Nov 12 23:34:34 2014
@@ -444,37 +444,6 @@
</build>
</profile>
<profile>
- <id>rdb-postgres</id>
- <dependencies>
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>9.3-1100-jdbc4</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <!-- requires local copy of DB2 JDBC drivers -->
- <!-- run with -Ddb2.jdbc=foldername where foldername contains the 2 JARs-->
- <id>rdb-db2</id>
- <dependencies>
- <dependency>
- <groupId>org.example</groupId>
- <artifactId>db2</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>${db2.jdbc}/db2jcc4.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>org.example</groupId>
- <artifactId>db2-license</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>${db2.jdbc}/db2jcc_license_cu.jar</systemPath>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>java8</id>
<activation>
<jdk>[1.8,)</jdk>