You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by st...@apache.org on 2012/03/07 17:42:29 UTC
svn commit: r1298017 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store:
./ persistence/
Author: stefan
Date: Wed Mar 7 16:42:29 2012
New Revision: 1298017
URL: http://svn.apache.org/viewvc?rev=1298017&view=rev
Log:
renaming persistence abstraction layer
Added:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/BDbPersistence.java
- copied, changed from r1298016, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/BDbPersistenceManager.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/FSPersistence.java
- copied, changed from r1298016, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/FSPersistenceManager.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/H2Persistence.java
- copied, changed from r1298016, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/H2PersistenceManager.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/InMemPersistence.java
- copied, changed from r1298016, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/InMemPersistenceManager.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/MongoPersistence.java
- copied, changed from r1298016, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/MongoPersistenceManager.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/Persistence.java
- copied, changed from r1298016, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/PersistenceManager.java
Removed:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/BDbPersistenceManager.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/FSPersistenceManager.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/H2PersistenceManager.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/InMemPersistenceManager.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/MongoPersistenceManager.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/PersistenceManager.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/DefaultRevisionStore.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/DefaultRevisionStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/DefaultRevisionStore.java?rev=1298017&r1=1298016&r2=1298017&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/DefaultRevisionStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/DefaultRevisionStore.java Wed Mar 7 16:42:29 2012
@@ -24,8 +24,8 @@ import org.apache.jackrabbit.mk.model.Mu
import org.apache.jackrabbit.mk.model.MutableNode;
import org.apache.jackrabbit.mk.model.StoredCommit;
import org.apache.jackrabbit.mk.model.StoredNode;
-import org.apache.jackrabbit.mk.store.persistence.H2PersistenceManager;
-import org.apache.jackrabbit.mk.store.persistence.PersistenceManager;
+import org.apache.jackrabbit.mk.store.persistence.H2Persistence;
+import org.apache.jackrabbit.mk.store.persistence.Persistence;
import org.apache.jackrabbit.mk.util.SimpleLRUCache;
import org.apache.jackrabbit.mk.util.StringUtils;
import org.apache.jackrabbit.oak.model.NodeState;
@@ -38,7 +38,7 @@ import java.util.Map;
import java.util.concurrent.locks.ReentrantReadWriteLock;
/**
- * Default revision store implementation, passing calls to a <code>PersistenceManager</code>
+ * Default revision store implementation, passing calls to a <code>Persistence</code>
* and a <code>BlobStore</code>, respectively and providing caching.
*/
public class DefaultRevisionStore implements RevisionStore, Closeable {
@@ -51,7 +51,7 @@ public class DefaultRevisionStore implem
private String headId;
private long headCounter;
private final ReentrantReadWriteLock headLock = new ReentrantReadWriteLock();
- private PersistenceManager pm;
+ private Persistence pm;
private BlobStore blobStore;
private boolean blobStoreNeedsClose;
@@ -64,11 +64,11 @@ public class DefaultRevisionStore implem
cache = Collections.synchronizedMap(SimpleLRUCache.<Id, Object>newInstance(determineInitialCacheSize()));
- pm = new H2PersistenceManager();
- //pm = new InMemPersistenceManager();
- //pm = new MongoPersistenceManager();
- //pm = new BDbPersistenceManager();
- //pm = new FSPersistenceManager();
+ pm = new H2Persistence();
+ //pm = new InMemPersistence();
+ //pm = new MongoPersistence();
+ //pm = new BDbPersistence();
+ //pm = new FSPersistence();
pm.initialize(homeDir);
if (pm instanceof BlobStore) {
Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/BDbPersistence.java (from r1298016, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/BDbPersistenceManager.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/BDbPersistence.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/BDbPersistence.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/BDbPersistenceManager.java&r1=1298016&r2=1298017&rev=1298017&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/BDbPersistenceManager.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/BDbPersistence.java Wed Mar 7 16:42:29 2012
@@ -44,7 +44,7 @@ import com.sleepycat.je.OperationStatus;
/**
*
*/
-public class BDbPersistenceManager implements PersistenceManager {
+public class BDbPersistence implements Persistence {
private final static byte[] HEAD_ID = new byte[]{0};
private Environment dbEnv;
Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/FSPersistence.java (from r1298016, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/FSPersistenceManager.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/FSPersistence.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/FSPersistence.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/FSPersistenceManager.java&r1=1298016&r2=1298017&rev=1298017&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/FSPersistenceManager.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/FSPersistence.java Wed Mar 7 16:42:29 2012
@@ -36,7 +36,7 @@ import org.apache.jackrabbit.mk.util.IOU
/**
*
*/
-public class FSPersistenceManager implements PersistenceManager {
+public class FSPersistence implements Persistence {
private File dataDir;
private File head;
Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/H2Persistence.java (from r1298016, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/H2PersistenceManager.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/H2Persistence.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/H2Persistence.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/H2PersistenceManager.java&r1=1298016&r2=1298017&rev=1298017&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/H2PersistenceManager.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/H2Persistence.java Wed Mar 7 16:42:29 2012
@@ -39,7 +39,7 @@ import java.sql.Statement;
/**
*
*/
-public class H2PersistenceManager implements PersistenceManager {
+public class H2Persistence implements Persistence {
private static final boolean FAST = Boolean.getBoolean("mk.fastDb");
@@ -48,7 +48,7 @@ public class H2PersistenceManager implem
// TODO: make this configurable
private IdFactory idFactory = IdFactory.getDigestFactory();
- //---------------------------------------------------< PersistenceManager >
+ //---------------------------------------------------< Persistence >
public void initialize(File homeDir) throws Exception {
File dbDir = new File(homeDir, "db");
Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/InMemPersistence.java (from r1298016, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/InMemPersistenceManager.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/InMemPersistence.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/InMemPersistence.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/InMemPersistenceManager.java&r1=1298016&r2=1298017&rev=1298017&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/InMemPersistenceManager.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/InMemPersistence.java Wed Mar 7 16:42:29 2012
@@ -40,7 +40,7 @@ import org.apache.jackrabbit.mk.util.Str
/**
*
*/
-public class InMemPersistenceManager implements PersistenceManager, BlobStore {
+public class InMemPersistence implements Persistence, BlobStore {
private final Map<Id, byte[]> nodes = Collections.synchronizedMap(new HashMap<Id, byte[]>());
private final Map<String, StoredCommit> commits = Collections.synchronizedMap(new HashMap<String, StoredCommit>());
Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/MongoPersistence.java (from r1298016, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/MongoPersistenceManager.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/MongoPersistence.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/MongoPersistence.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/MongoPersistenceManager.java&r1=1298016&r2=1298017&rev=1298017&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/MongoPersistenceManager.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/MongoPersistence.java Wed Mar 7 16:42:29 2012
@@ -52,7 +52,7 @@ import com.mongodb.gridfs.GridFSInputFil
/**
*
*/
-public class MongoPersistenceManager implements PersistenceManager, BlobStore {
+public class MongoPersistence implements Persistence, BlobStore {
private static final boolean BINARY_FORMAT = false;
Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/Persistence.java (from r1298016, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/PersistenceManager.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/Persistence.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/Persistence.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/PersistenceManager.java&r1=1298016&r2=1298017&rev=1298017&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/PersistenceManager.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/store/persistence/Persistence.java Wed Mar 7 16:42:29 2012
@@ -33,7 +33,7 @@ import org.apache.jackrabbit.mk.store.No
* TODO: instead of deserializing objects on their own, return Binding
* instances, such as in #readNodeBinding.
*/
-public interface PersistenceManager {
+public interface Persistence {
void initialize(File homeDir) throws Exception;