Author: reschke
Date: Wed Jan 22 16:15:50 2014
New Revision: 1560403
URL: http://svn.apache.org/r1560403
Log:
OAK-1266 - s/SQL/RDB/
Added:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/RDBBlobStore.java
- copied, changed from r1560374,
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/SQLBlobStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/RDBDocumentStore.java
- copied, changed from r1560374,
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/SQLDocumentStore.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/blob/RDBBlobStoreTest.java
- copied, changed from r1560374,
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/blob/SQLBlobStoreTest.java
Removed:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/SQLBlobStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/SQLDocumentStore.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/blob/SQLBlobStoreTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMK.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMK.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMK.java?rev=1560403&r1=1560402&r2=1560403&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMK.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMK.java
Wed Jan 22 16:15:50 2014
@@ -47,8 +47,8 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.plugins.mongomk.Node.Children;
import org.apache.jackrabbit.oak.plugins.mongomk.blob.MongoBlobStore;
import org.apache.jackrabbit.oak.plugins.mongomk.util.Utils;
-import org.apache.jackrabbit.oak.plugins.sqlpersistence.SQLBlobStore;
-import org.apache.jackrabbit.oak.plugins.sqlpersistence.SQLDocumentStore;
+import org.apache.jackrabbit.oak.plugins.sqlpersistence.RDBBlobStore;
+import org.apache.jackrabbit.oak.plugins.sqlpersistence.RDBDocumentStore;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -686,8 +686,8 @@ public class MongoMK implements MicroKer
*/
public Builder setMongoJDBC(String jdbcurl, String username, String
password) {
// TODO maybe we need different connections for document store and
node store
- this.documentStore = new SQLDocumentStore(jdbcurl, username,
password);
- this.blobStore = new SQLBlobStore(jdbcurl, username, password);
+ this.documentStore = new RDBDocumentStore(jdbcurl, username,
password);
+ this.blobStore = new RDBBlobStore(jdbcurl, username, password);
return this;
}
Copied:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/RDBBlobStore.java
(from r1560374,
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/SQLBlobStore.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/RDBBlobStore.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/RDBBlobStore.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/SQLBlobStore.java&r1=1560374&r2=1560403&rev=1560403&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/SQLBlobStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/RDBBlobStore.java
Wed Jan 22 16:15:50 2014
@@ -31,44 +31,44 @@ import org.apache.jackrabbit.mk.api.Micr
import org.apache.jackrabbit.mk.blobs.AbstractBlobStore;
import org.apache.jackrabbit.mk.util.StringUtils;
-public class SQLBlobStore extends AbstractBlobStore {
+public class RDBBlobStore extends AbstractBlobStore {
/**
- * Creates a {@linkplain SQLBlobStore} instance using an embedded H2
+ * Creates a {@linkplain RDBBlobStore} instance using an embedded H2
* database in in-memory mode.
*/
- public SQLBlobStore() {
+ public RDBBlobStore() {
try {
String jdbcurl = "jdbc:h2:mem:oaknodes";
Connection connection = DriverManager.getConnection(jdbcurl, "sa",
"");
initialize(connection);
} catch (Exception ex) {
- throw new MicroKernelException("initializing SQL blob store", ex);
+ throw new MicroKernelException("initializing RDB blob store", ex);
}
}
/**
- * Creates a {@linkplain SQLBlobStore} instance using the provided JDBC
+ * Creates a {@linkplain RDBBlobStore} instance using the provided JDBC
* connection information.
*/
- public SQLBlobStore(String jdbcurl, String username, String password) {
+ public RDBBlobStore(String jdbcurl, String username, String password) {
try {
Connection connection = DriverManager.getConnection(jdbcurl,
username, password);
initialize(connection);
} catch (Exception ex) {
- throw new MicroKernelException("initializing SQL blob store", ex);
+ throw new MicroKernelException("initializing RDB blob store", ex);
}
}
/**
- * Creates a {@linkplain SQLBlobStore} instance using the provided
+ * Creates a {@linkplain RDBBlobStore} instance using the provided
* {@link DataSource}.
*/
- public SQLBlobStore(DataSource ds) {
+ public RDBBlobStore(DataSource ds) {
try {
initialize(ds.getConnection());
} catch (Exception ex) {
- throw new MicroKernelException("initializing SQL blob store", ex);
+ throw new MicroKernelException("initializing RDB blob store", ex);
}
}
Copied:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/RDBDocumentStore.java
(from r1560374,
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/SQLDocumentStore.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/RDBDocumentStore.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/RDBDocumentStore.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/SQLDocumentStore.java&r1=1560374&r2=1560403&rev=1560403&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/SQLDocumentStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/sqlpersistence/RDBDocumentStore.java
Wed Jan 22 16:15:50 2014
@@ -48,43 +48,43 @@ import org.json.simple.parser.ParseExcep
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SQLDocumentStore implements DocumentStore {
+public class RDBDocumentStore implements DocumentStore {
/**
- * Creates a {@linkplain SQLDocumentStore} instance using an embedded H2
+ * Creates a {@linkplain RDBDocumentStore} instance using an embedded H2
* database in in-memory mode.
*/
- public SQLDocumentStore() {
+ public RDBDocumentStore() {
try {
String jdbcurl = "jdbc:h2:mem:oaknodes";
Connection connection = DriverManager.getConnection(jdbcurl, "sa",
"");
initialize(connection);
} catch (Exception ex) {
- throw new MicroKernelException("initializing SQL document store",
ex);
+ throw new MicroKernelException("initializing RDB document store",
ex);
}
}
/**
- * Creates a {@linkplain SQLDocumentStore} instance using the provided
{@link DataSource}.
+ * Creates a {@linkplain RDBDocumentStore} instance using the provided
{@link DataSource}.
*/
- public SQLDocumentStore(DataSource ds) {
+ public RDBDocumentStore(DataSource ds) {
try {
initialize(ds.getConnection());
} catch (Exception ex) {
- throw new MicroKernelException("initializing SQL document store",
ex);
+ throw new MicroKernelException("initializing RDB document store",
ex);
}
}
/**
- * Creates a {@linkplain SQLDocumentStore} instance using the provided JDBC
+ * Creates a {@linkplain RDBDocumentStore} instance using the provided JDBC
* connection information.
*/
- public SQLDocumentStore(String jdbcurl, String username, String password) {
+ public RDBDocumentStore(String jdbcurl, String username, String password) {
try {
Connection connection = DriverManager.getConnection(jdbcurl,
username, password);
initialize(connection);
} catch (Exception ex) {
- throw new MicroKernelException("initializing SQL document store",
ex);
+ throw new MicroKernelException("initializing RDB document store",
ex);
}
}
@@ -165,7 +165,7 @@ public class SQLDocumentStore implements
private final String MODIFIED = "_modified";
private final String MODCOUNT = "_modCount";
- private static final Logger LOG =
LoggerFactory.getLogger(SQLDocumentStore.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(RDBDocumentStore.class);
private final Comparator<Revision> comparator =
StableRevisionComparator.REVERSE;
Copied:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/blob/RDBBlobStoreTest.java
(from r1560374,
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/blob/SQLBlobStoreTest.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/blob/RDBBlobStoreTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/blob/RDBBlobStoreTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/blob/SQLBlobStoreTest.java&r1=1560374&r2=1560403&rev=1560403&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/blob/SQLBlobStoreTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/blob/RDBBlobStoreTest.java
Wed Jan 22 16:15:50 2014
@@ -16,17 +16,17 @@
*/
package org.apache.jackrabbit.oak.plugins.mongomk.blob;
-import org.apache.jackrabbit.oak.plugins.sqlpersistence.SQLBlobStore;
+import org.apache.jackrabbit.oak.plugins.sqlpersistence.RDBBlobStore;
/**
- * Tests the SQLBlobStore implementation.
+ * Tests the RDBBlobStore implementation.
*/
-public class SQLBlobStoreTest extends AbstractBlobStoreTest {
+public class RDBBlobStoreTest extends AbstractBlobStoreTest {
- private SQLBlobStore blobStore;
+ private RDBBlobStore blobStore;
public void setUp() throws Exception {
- blobStore = new SQLBlobStore();
+ blobStore = new RDBBlobStore();
blobStore.setBlockSize(128);
blobStore.setBlockSizeMin(48);
this.store = blobStore;
