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 mr...@apache.org on 2014/01/28 12:28:25 UTC
svn commit: r1562039 [1/3] - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/
oak-core/src/main/java/org/apache/jackrabbit/oak/core/
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/
oak-core/src/main/java/or...
Author: mreutegg
Date: Tue Jan 28 11:28:23 2014
New Revision: 1562039
URL: http://svn.apache.org/r1562039
Log:
OAK-1360: Rename o.a.j.o.plugins.mongomk to o.a.j.o.plugins.document
- rename classes
Added:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentBlob.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoBlob.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java (contents, props changed)
- copied, changed from r1562024, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoMK.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeBuilder.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeBuilder.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeState.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (contents, props changed)
- copied, changed from r1562024, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeStoreBranch.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java (contents, props changed)
- copied, changed from r1562024, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeStoreService.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentPropertyState.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoPropertyState.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoRootBuilder.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BaseDocumentMKTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BaseMongoMKTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBranchMergeTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKBranchMergeTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBranchTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKBranchTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKCommitAddTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitCopyTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKCommitCopyTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitMoveTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKCommitMoveTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitRemoveTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKCommitRemoveTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKDiffTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKDiffTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKGetHeadRevisionTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKGetHeadRevisionTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKGetNodesTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKGetNodesTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKNodeExistsTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKNodeExistsTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKRebaseTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKRebaseTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKResetTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKResetTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKTestBase.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKTestBase.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java (contents, props changed)
- copied, changed from r1562024, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeStoreTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreIT.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKDocumentStoreIT.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKGetLengthGridFSTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKGetLengthGridFSTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKGetLengthTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKGetLengthTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadGridFSTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKReadGridFSTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKReadTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKWriteGridFSTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKWriteGridFSTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKWriteTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKWriteTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKConcurrentAddTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKConcurrentAddTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKGetChildCountTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKGetChildCountTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKGetJournalTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKGetJournalTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKGetRevisionHistoryTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKGetRevisionHistoryTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKLimitsTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKLimitsTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKWaitForCommitTest.java (contents, props changed)
- copied, changed from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKWaitForCommitTest.java
Removed:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoBlob.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoMK.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeBuilder.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeState.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeStoreBranch.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeStoreService.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoPropertyState.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoRootBuilder.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BaseMongoMKTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKBranchMergeTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKBranchTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKCommitAddTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKCommitCopyTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKCommitMoveTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKCommitRemoveTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKDiffTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKDocumentStoreIT.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKGetHeadRevisionTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKGetNodesTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKNodeExistsTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKRebaseTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKResetTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKTestBase.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeStoreTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKGetLengthGridFSTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKGetLengthTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKReadGridFSTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKReadTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKWriteGridFSTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKWriteTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKConcurrentAddTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKGetChildCountTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKGetJournalTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKGetRevisionHistoryTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKLimitsTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKWaitForCommitTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BlobReferenceIterator.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MergeCommit.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionContext.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnmergedBranches.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocOffHeapCache.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixture.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/LargeMoveTestIT.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMongoConnectionTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BackgroundWriteTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobReferenceTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterInfoTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterJoinTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest2.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentConflictTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentUpdatesTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConflictTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/IsolationTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ManyChildNodesTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MergeRetryTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/OptimizedChildFetchTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RandomizedClusterTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RandomizedTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/SimpleTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/command/ConcurrentWriteMultipleMkMongoTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/multitenancy/MultiTenancyTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/ClusterPermissionsTest.java
jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/BaseMongoMicroKernelFixture.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddNodesClusterIT.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoMKRepositoryStub.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoNSRepositoryStub.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakSegmentMKRepositoryStub.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/AbstractClusterTest.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/SmallFileWriteTest.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java Tue Jan 28 11:28:23 2014
@@ -284,9 +284,9 @@ public class Oak {
public Oak() {
this(new MicroKernelImpl());
- // this(new MongoMK.Builder().open());
+ // this(new DocumentMK.Builder().open());
// this(new LogWrapper(new MicroKernelImpl()));
- // this(new LogWrapper(new MongoMK.Builder().open()));
+ // this(new LogWrapper(new DocumentMK.Builder().open()));
}
/**
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java Tue Jan 28 11:28:23 2014
@@ -207,7 +207,7 @@ class SecureNodeState extends AbstractNo
// underlying node state even for non-leaf nodes if we can
// tell in advance that the full subtree is readable. Then
// we also wouldn't need the above getChildNodeCount() call
- // that's somewhat expensive on the MongoMK.
+ // that's somewhat expensive on the DocumentMK.
return input;
} else {
return new MemoryChildNodeEntry(name, secureChild);
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BlobReferenceIterator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BlobReferenceIterator.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BlobReferenceIterator.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BlobReferenceIterator.java Tue Jan 28 11:28:23 2014
@@ -39,14 +39,14 @@ import org.apache.jackrabbit.oak.plugins
public class BlobReferenceIterator implements Iterator<Blob> {
private static final int BATCH_SIZE = 1000;
- private final MongoNodeStore nodeStore;
+ private final DocumentNodeStore nodeStore;
private final DocumentStore docStore;
private HashSet<Blob> batch = new HashSet<Blob>();
private Iterator<Blob> batchIterator;
private boolean done;
private String fromKey = "0000000";
- public BlobReferenceIterator(MongoNodeStore nodeStore) {
+ public BlobReferenceIterator(DocumentNodeStore nodeStore) {
this.nodeStore = nodeStore;
this.docStore = nodeStore.getDocumentStore();
batchIterator = batch.iterator();
@@ -121,7 +121,7 @@ public class BlobReferenceIterator imple
JsopReader reader = new JsopTokenizer(v);
PropertyState p;
if (reader.matches('[')) {
- p = MongoPropertyState.readArrayProperty("x", nodeStore, reader);
+ p = DocumentPropertyState.readArrayProperty("x", nodeStore, reader);
if (p.getType() == Type.BINARIES) {
for (int i = 0; i < p.count(); i++) {
Blob b = p.getValue(Type.BINARY, i);
@@ -129,7 +129,7 @@ public class BlobReferenceIterator imple
}
}
} else {
- p = MongoPropertyState.readProperty("x", nodeStore, reader);
+ p = DocumentPropertyState.readProperty("x", nodeStore, reader);
if (p.getType() == Type.BINARY) {
Blob b = p.getValue(Type.BINARY);
batch.add(b);
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java Tue Jan 28 11:28:23 2014
@@ -45,7 +45,7 @@ public class Commit {
private static final Logger LOG = LoggerFactory.getLogger(Commit.class);
- private final MongoNodeStore nodeStore;
+ private final DocumentNodeStore nodeStore;
private final Revision baseRevision;
private final Revision revision;
private HashMap<String, UpdateOp> operations = new LinkedHashMap<String, UpdateOp>();
@@ -61,7 +61,7 @@ public class Commit {
private HashSet<String> addedNodes = new HashSet<String>();
private HashSet<String> removedNodes = new HashSet<String>();
- Commit(MongoNodeStore nodeStore, Revision baseRevision, Revision revision) {
+ Commit(DocumentNodeStore nodeStore, Revision baseRevision, Revision revision) {
this.baseRevision = baseRevision;
this.revision = revision;
this.nodeStore = nodeStore;
@@ -96,7 +96,7 @@ public class Commit {
/**
* Returns the base revision for this commit. That is, the revision passed
- * to {@link MongoMK#commit(String, String, String, String)}. The base
+ * to {@link DocumentMK#commit(String, String, String, String)}. The base
* revision may be <code>null</code>, e.g. for the initial commit of the
* root node, when there is no base revision.
*
@@ -442,7 +442,7 @@ public class Commit {
}
/**
- * Apply the changes to the MongoMK (to update the cache).
+ * Apply the changes to the DocumentMK (to update the cache).
*
* @param isBranchCommit whether this is a commit to a branch
*/
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java Tue Jan 28 11:28:23 2014
@@ -42,13 +42,13 @@ class CommitQueue {
static final Logger LOG = LoggerFactory.getLogger(CommitQueue.class);
- private final MongoNodeStore store;
+ private final DocumentNodeStore store;
private final SortedMap<Revision, Entry> commits = new TreeMap<Revision, Entry>(StableRevisionComparator.INSTANCE);
private final ChangeDispatcher dispatcher;
- CommitQueue(MongoNodeStore store, ChangeDispatcher dispatcher) {
+ CommitQueue(DocumentNodeStore store, ChangeDispatcher dispatcher) {
this.store = store;
this.dispatcher = dispatcher;
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java Tue Jan 28 11:28:23 2014
@@ -32,7 +32,7 @@ import org.apache.jackrabbit.oak.plugins
import com.google.common.collect.Maps;
/**
- * A document corresponds to a node stored in the MongoMK. A document contains
+ * A document corresponds to a node stored in the DocumentMK. A document contains
* all the revisions of a node stored in the {@link DocumentStore}.
*/
public class Document implements CacheValue {
Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentBlob.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoBlob.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentBlob.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentBlob.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoBlob.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoBlob.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentBlob.java Tue Jan 28 11:28:23 2014
@@ -28,12 +28,12 @@ import org.apache.jackrabbit.oak.api.Blo
/**
* A blob implementation.
*/
-public class MongoBlob implements Blob {
+public class DocumentBlob implements Blob {
private final BlobStore blobStore;
private final String id;
- public MongoBlob(BlobStore blobStore, String id) {
+ public DocumentBlob(BlobStore blobStore, String id) {
this.blobStore = blobStore;
this.id = id;
}
@@ -75,8 +75,8 @@ public class MongoBlob implements Blob {
if (this == other) {
return true;
}
- if (other instanceof MongoBlob) {
- MongoBlob b = (MongoBlob) other;
+ if (other instanceof DocumentBlob) {
+ DocumentBlob b = (DocumentBlob) other;
// theoretically, the data could be the same
// even if the id is different
return b.id.equals(id);
Propchange: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentBlob.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java (from r1562024, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoMK.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoMK.java&r1=1562024&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoMK.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java Tue Jan 28 11:28:23 2014
@@ -58,7 +58,7 @@ import static com.google.common.base.Pre
/**
* A MicroKernel implementation that stores the data in a MongoDB.
*/
-public class MongoMK implements MicroKernel {
+public class DocumentMK implements MicroKernel {
/**
* The threshold where special handling for many child node starts.
@@ -81,7 +81,7 @@ public class MongoMK implements MicroKer
/**
* The MongoDB store.
*/
- protected final MongoNodeStore nodeStore;
+ protected final DocumentNodeStore nodeStore;
/**
* The MongoDB store (might be used by multiple MongoMKs).
@@ -94,7 +94,7 @@ public class MongoMK implements MicroKer
private final Cache<String, Diff> diffCache;
private final CacheStats diffCacheStats;
- MongoMK(Builder builder) {
+ DocumentMK(Builder builder) {
this.nodeStore = builder.getNodeStore();
this.store = nodeStore.getDocumentStore();
@@ -119,7 +119,7 @@ public class MongoMK implements MicroKer
nodeStore.runBackgroundOperations();
}
- public MongoNodeStore getNodeStore() {
+ public DocumentNodeStore getNodeStore() {
return nodeStore;
}
@@ -649,11 +649,11 @@ public class MongoMK implements MicroKer
//----------------------------< Builder >-----------------------------------
/**
- * A builder for a MongoMK instance.
+ * A builder for a DocumentMK instance.
*/
public static class Builder {
private static final long DEFAULT_MEMORY_CACHE_SIZE = 256 * 1024 * 1024;
- private MongoNodeStore nodeStore;
+ private DocumentNodeStore nodeStore;
private DocumentStore documentStore;
private BlobStore blobStore;
private int clusterId = Integer.getInteger("oak.mongoMK.clusterId", 0);
@@ -756,9 +756,9 @@ public class MongoMK implements MicroKer
return documentStore;
}
- public MongoNodeStore getNodeStore() {
+ public DocumentNodeStore getNodeStore() {
if (nodeStore == null) {
- nodeStore = new MongoNodeStore(this);
+ nodeStore = new DocumentNodeStore(this);
}
return nodeStore;
}
@@ -883,12 +883,12 @@ public class MongoMK implements MicroKer
}
/**
- * Open the MongoMK instance using the configured options.
+ * Open the DocumentMK instance using the configured options.
*
- * @return the MongoMK instance
+ * @return the DocumentMK instance
*/
- public MongoMK open() {
- return new MongoMK(this);
+ public DocumentMK open() {
+ return new DocumentMK(this);
}
public <V extends CacheValue> Cache<String, V> buildCache(long maxWeight) {
Propchange: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeBuilder.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeBuilder.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeBuilder.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeBuilder.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeBuilder.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeBuilder.java Tue Jan 28 11:28:23 2014
@@ -29,19 +29,19 @@ import org.apache.jackrabbit.oak.spi.sta
import static com.google.common.base.Preconditions.checkNotNull;
/**
- * A node builder implementation for MongoMK.
+ * A node builder implementation for DocumentMK.
*/
-class MongoNodeBuilder extends MemoryNodeBuilder {
+class DocumentNodeBuilder extends MemoryNodeBuilder {
- private final MongoRootBuilder root;
+ private final DocumentRootBuilder root;
private NodeState base = null;
private NodeState rootBase = null;
- MongoNodeBuilder(MemoryNodeBuilder base,
- String name,
- MongoRootBuilder root) {
+ DocumentNodeBuilder(MemoryNodeBuilder base,
+ String name,
+ DocumentRootBuilder root) {
super(base, name);
this.root = checkNotNull(root);
}
@@ -57,21 +57,21 @@ class MongoNodeBuilder extends MemoryNod
}
@Override
- protected MongoNodeBuilder createChildBuilder(String name) {
- return new MongoNodeBuilder(this, name, root);
+ protected DocumentNodeBuilder createChildBuilder(String name) {
+ return new DocumentNodeBuilder(this, name, root);
}
@Override
public boolean moveTo(NodeBuilder newParent, String newName) {
- if (newParent instanceof MongoNodeBuilder) {
+ if (newParent instanceof DocumentNodeBuilder) {
// check if this builder is an ancestor of newParent or newParent
- MongoNodeBuilder parent = (MongoNodeBuilder) newParent;
+ DocumentNodeBuilder parent = (DocumentNodeBuilder) newParent;
while (parent != null) {
if (parent == this) {
return false;
}
if (parent.getParent() != root) {
- parent = (MongoNodeBuilder) parent.getParent();
+ parent = (DocumentNodeBuilder) parent.getParent();
} else {
// reached root builder
break;
Propchange: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeBuilder.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeState.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeState.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java Tue Jan 28 11:28:23 2014
@@ -42,10 +42,10 @@ import static com.google.common.base.Pre
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
/**
- * A {@link NodeState} implementation for the {@link MongoNodeStore}.
- * TODO: merge MongoNodeState with Node
+ * A {@link NodeState} implementation for the {@link DocumentNodeStore}.
+ * TODO: merge DocumentNodeState with Node
*/
-final class MongoNodeState extends AbstractNodeState {
+final class DocumentNodeState extends AbstractNodeState {
/**
* The number of child nodes to fetch initially.
@@ -57,7 +57,7 @@ final class MongoNodeState extends Abstr
*/
static final int MAX_FETCH_SIZE = INITIAL_FETCH_SIZE << 4;
- private final MongoNodeStore store;
+ private final DocumentNodeStore store;
private final Node node;
@@ -66,8 +66,7 @@ final class MongoNodeState extends Abstr
*/
private boolean isBranch;
- MongoNodeState(@Nonnull MongoNodeStore store,
- @Nonnull Node node) {
+ DocumentNodeState(@Nonnull DocumentNodeStore store, @Nonnull Node node) {
this.store = checkNotNull(store);
this.node = checkNotNull(node);
}
@@ -80,7 +79,7 @@ final class MongoNodeState extends Abstr
return node.getReadRevision();
}
- MongoNodeState setBranch() {
+ DocumentNodeState setBranch() {
isBranch = true;
return this;
}
@@ -95,8 +94,8 @@ final class MongoNodeState extends Abstr
public boolean equals(Object that) {
if (this == that) {
return true;
- } else if (that instanceof MongoNodeState) {
- MongoNodeState other = (MongoNodeState) that;
+ } else if (that instanceof DocumentNodeState) {
+ DocumentNodeState other = (DocumentNodeState) that;
if (getPath().equals(other.getPath())) {
return node.getLastRevision().equals(other.node.getLastRevision());
}
@@ -124,7 +123,7 @@ final class MongoNodeState extends Abstr
if (value == null) {
return null;
}
- return new MongoPropertyState(store, name, value);
+ return new DocumentPropertyState(store, name, value);
}
@Override
@@ -154,7 +153,7 @@ final class MongoNodeState extends Abstr
if (child == null) {
return EmptyNodeState.MISSING_NODE;
} else {
- return new MongoNodeState(store, child);
+ return new DocumentNodeState(store, child);
}
}
@@ -178,7 +177,7 @@ final class MongoNodeState extends Abstr
if (isBranch) {
return new MemoryNodeBuilder(this);
} else if ("/".equals(getPath())) {
- return new MongoRootBuilder(this, store);
+ return new DocumentRootBuilder(this, store);
} else {
return new MemoryNodeBuilder(this);
}
@@ -191,8 +190,8 @@ final class MongoNodeState extends Abstr
} else if (base == EMPTY_NODE || !base.exists()) {
// special case
return EmptyNodeState.compareAgainstEmptyState(this, diff);
- } else if (base instanceof MongoNodeState) {
- MongoNodeState mBase = (MongoNodeState) base;
+ } else if (base instanceof DocumentNodeState) {
+ DocumentNodeState mBase = (DocumentNodeState) base;
if (store == mBase.store) {
if (node.getLastRevision().equals(mBase.node.getLastRevision())
&& getPath().equals(mBase.getPath())) {
@@ -235,7 +234,7 @@ final class MongoNodeState extends Abstr
@Nonnull
@Override
public NodeState getNodeState() {
- return new MongoNodeState(store, input);
+ return new DocumentNodeState(store, input);
}
};
}
Propchange: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (from r1562024, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeStore.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeStore.java&r1=1562024&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java Tue Jan 28 11:28:23 2014
@@ -75,7 +75,7 @@ import org.slf4j.LoggerFactory;
/**
* Implementation of a NodeStore on MongoDB.
*/
-public final class MongoNodeStore
+public final class DocumentNodeStore
implements NodeStore, RevisionContext, Observable {
/**
@@ -83,7 +83,7 @@ public final class MongoNodeStore
*/
static final int BACKGROUND_MULTI_UPDATE_LIMIT = 10000;
- private static final Logger LOG = LoggerFactory.getLogger(MongoNodeStore.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DocumentNodeStore.class);
/**
* Do not cache more than this number of children for a document.
@@ -150,7 +150,7 @@ public final class MongoNodeStore
private final Revision.RevisionComparator revisionComparator;
/**
- * Unmerged branches of this MongoNodeStore instance.
+ * Unmerged branches of this DocumentNodeStore instance.
*/
// TODO at some point, open (unmerged) branches
// need to be garbage collected (in-memory and on disk)
@@ -232,7 +232,7 @@ public final class MongoNodeStore
private final BlobSerializer blobSerializer = new BlobSerializer() {
@Override
public String serialize(Blob blob) {
- if (blob instanceof MongoBlob) {
+ if (blob instanceof DocumentBlob) {
return blob.toString();
}
String id;
@@ -245,7 +245,7 @@ public final class MongoNodeStore
}
};
- public MongoNodeStore(MongoMK.Builder builder) {
+ public DocumentNodeStore(DocumentMK.Builder builder) {
this.blobStore = builder.getBlobStore();
if (builder.isUseSimpleRevision()) {
this.simpleRevisionCounter = new AtomicInteger(0);
@@ -315,11 +315,11 @@ public final class MongoNodeStore
commitQueue = new CommitQueue(this, dispatcher);
backgroundThread = new Thread(
new BackgroundOperation(this, isDisposed),
- "MongoNodeStore background thread");
+ "DocumentNodeStore background thread");
backgroundThread.setDaemon(true);
backgroundThread.start();
- LOG.info("Initialized MongoNodeStore with clusterNodeId: {}", clusterId);
+ LOG.info("Initialized DocumentNodeStore with clusterNodeId: {}", clusterId);
}
public void dispose() {
@@ -337,7 +337,7 @@ public final class MongoNodeStore
clusterNodeInfo.dispose();
}
store.dispose();
- LOG.info("Disposed MongoNodeStore with clusterNodeId: {}", clusterId);
+ LOG.info("Disposed DocumentNodeStore with clusterNodeId: {}", clusterId);
}
}
@@ -832,18 +832,18 @@ public final class MongoNodeStore
* @return the root node state at the given revision.
*/
@Nonnull
- MongoNodeState getRoot(@Nonnull Revision revision) {
+ DocumentNodeState getRoot(@Nonnull Revision revision) {
Node root = getNode("/", revision);
if (root == null) {
throw new IllegalStateException(
"root node does not exist at revision " + revision);
}
- return new MongoNodeState(this, root);
+ return new DocumentNodeState(this, root);
}
@Nonnull
- MongoNodeStoreBranch createBranch(MongoNodeState base) {
- return new MongoNodeStoreBranch(this, base);
+ DocumentNodeStoreBranch createBranch(DocumentNodeState base) {
+ return new DocumentNodeStoreBranch(this, base);
}
@Nonnull
@@ -1031,7 +1031,7 @@ public final class MongoNodeStore
*/
@Nonnull
Blob getBlob(String blobId) {
- return new MongoBlob(blobStore, blobId);
+ return new DocumentBlob(blobStore, blobId);
}
//------------------------< Observable >------------------------------------
@@ -1045,7 +1045,7 @@ public final class MongoNodeStore
@Nonnull
@Override
- public MongoNodeState getRoot() {
+ public DocumentNodeState getRoot() {
return getRoot(headRevision);
}
@@ -1079,7 +1079,7 @@ public final class MongoNodeStore
} catch (Exception e) {
throw new IOException("Could not write blob", e);
}
- return new MongoBlob(blobStore, id);
+ return new DocumentBlob(blobStore, id);
}
@Nonnull
@@ -1287,13 +1287,13 @@ public final class MongoNodeStore
return (name == null ? "" : name) + path + "@" + readRevision;
}
- private static MongoRootBuilder asMongoRootBuilder(NodeBuilder builder)
+ private static DocumentRootBuilder asMongoRootBuilder(NodeBuilder builder)
throws IllegalArgumentException {
- if (!(builder instanceof MongoRootBuilder)) {
+ if (!(builder instanceof DocumentRootBuilder)) {
throw new IllegalArgumentException("builder must be a " +
- MongoRootBuilder.class.getName());
+ DocumentRootBuilder.class.getName());
}
- return (MongoRootBuilder) builder;
+ return (DocumentRootBuilder) builder;
}
private void moveOrCopyNode(boolean move,
@@ -1336,12 +1336,12 @@ public final class MongoNodeStore
* A background thread.
*/
static class BackgroundOperation implements Runnable {
- final WeakReference<MongoNodeStore> ref;
+ final WeakReference<DocumentNodeStore> ref;
private final AtomicBoolean isDisposed;
private int delay;
- BackgroundOperation(MongoNodeStore nodeStore, AtomicBoolean isDisposed) {
- ref = new WeakReference<MongoNodeStore>(nodeStore);
+ BackgroundOperation(DocumentNodeStore nodeStore, AtomicBoolean isDisposed) {
+ ref = new WeakReference<DocumentNodeStore>(nodeStore);
delay = nodeStore.getAsyncDelay();
this.isDisposed = isDisposed;
}
@@ -1356,7 +1356,7 @@ public final class MongoNodeStore
// ignore
}
}
- MongoNodeStore nodeStore = ref.get();
+ DocumentNodeStore nodeStore = ref.get();
if (nodeStore != null) {
nodeStore.runBackgroundOperations();
delay = nodeStore.getAsyncDelay();
Propchange: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeStoreBranch.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeStoreBranch.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeStoreBranch.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java Tue Jan 28 11:28:23 2014
@@ -27,51 +27,51 @@ import org.apache.jackrabbit.oak.spi.sta
import static com.google.common.base.Preconditions.checkState;
/**
- * Implementation of a MongoMK based node store branch.
+ * Implementation of a DocumentMK based node store branch.
*/
-public class MongoNodeStoreBranch
- extends AbstractNodeStoreBranch<MongoNodeStore, MongoNodeState> {
+public class DocumentNodeStoreBranch
+ extends AbstractNodeStoreBranch<DocumentNodeStore, DocumentNodeState> {
- public MongoNodeStoreBranch(MongoNodeStore store,
- MongoNodeState base) {
+ public DocumentNodeStoreBranch(DocumentNodeStore store,
+ DocumentNodeState base) {
super(store, new ChangeDispatcher(store.getRoot()), base);
}
@Override
- protected MongoNodeState getRoot() {
+ protected DocumentNodeState getRoot() {
return store.getRoot();
}
@Override
- protected MongoNodeState createBranch(MongoNodeState state) {
+ protected DocumentNodeState createBranch(DocumentNodeState state) {
return store.getRoot(state.getRevision().asBranchRevision()).setBranch();
}
@Override
- protected MongoNodeState rebase(MongoNodeState branchHead,
- MongoNodeState base) {
+ protected DocumentNodeState rebase(DocumentNodeState branchHead,
+ DocumentNodeState base) {
return store.getRoot(store.rebase(branchHead.getRevision(), base.getRevision())).setBranch();
}
@Override
- protected MongoNodeState merge(MongoNodeState branchHead, CommitInfo info)
+ protected DocumentNodeState merge(DocumentNodeState branchHead, CommitInfo info)
throws CommitFailedException {
return store.getRoot(store.merge(branchHead.getRevision(), info));
}
@Nonnull
@Override
- protected MongoNodeState reset(@Nonnull MongoNodeState branchHead,
- @Nonnull MongoNodeState ancestor) {
+ protected DocumentNodeState reset(@Nonnull DocumentNodeState branchHead,
+ @Nonnull DocumentNodeState ancestor) {
return store.getRoot(store.reset(branchHead.getRevision(),
ancestor.getRevision())).setBranch();
}
@Override
- protected MongoNodeState persist(final NodeState toPersist,
- final MongoNodeState base,
+ protected DocumentNodeState persist(final NodeState toPersist,
+ final DocumentNodeState base,
final CommitInfo info) {
- MongoNodeState state = persist(new Changes() {
+ DocumentNodeState state = persist(new Changes() {
@Override
public void with(Commit c) {
toPersist.compareAgainstBaseState(base,
@@ -85,9 +85,9 @@ public class MongoNodeStoreBranch
}
@Override
- protected MongoNodeState copy(final String source,
+ protected DocumentNodeState copy(final String source,
final String target,
- MongoNodeState base) {
+ DocumentNodeState base) {
final Node src = store.getNode(source, base.getRevision());
checkState(src != null, "Source node %s@%s does not exist",
source, base.getRevision());
@@ -100,9 +100,9 @@ public class MongoNodeStoreBranch
}
@Override
- protected MongoNodeState move(final String source,
+ protected DocumentNodeState move(final String source,
final String target,
- MongoNodeState base) {
+ DocumentNodeState base) {
final Node src = store.getNode(source, base.getRevision());
checkState(src != null, "Source node %s@%s does not exist",
source, base.getRevision());
@@ -124,8 +124,8 @@ public class MongoNodeStoreBranch
* @param info the commit info.
* @return the result state.
*/
- private MongoNodeState persist(Changes op,
- MongoNodeState base,
+ private DocumentNodeState persist(Changes op,
+ DocumentNodeState base,
CommitInfo info) {
boolean success = false;
Commit c = store.newCommit(base.getRevision());
Propchange: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java (from r1562024, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeStoreService.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeStoreService.java&r1=1562024&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeStoreService.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java Tue Jan 28 11:28:23 2014
@@ -50,14 +50,14 @@ import org.slf4j.LoggerFactory;
import static org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.registerMBean;
/**
- * The OSGi service to start/stop a MongoNodeStore instance.
+ * The OSGi service to start/stop a DocumentNodeStore instance.
*/
@Component(metatype = true,
label = "%oak.mongons.label",
description = "%oak.mongons.description",
policy = ConfigurationPolicy.REQUIRE
)
-public class MongoNodeStoreService{
+public class DocumentNodeStoreService {
private static final String DEFAULT_URI = "mongodb://localhost:27017/oak";
private static final int DEFAULT_CACHE = 256;
private static final int DEFAULT_OFF_HEAP_CACHE = 0;
@@ -75,7 +75,7 @@ public class MongoNodeStoreService{
*/
private static final String FWK_PROP_DB = "oak.mongo.db";
- //MongoMK would be done away with so better not
+ //DocumentMK would be done away with so better not
//to expose this setting in config ui
@Property(boolValue = false, propertyPrivate = true)
private static final String PROP_USE_MK = "useMK";
@@ -98,7 +98,7 @@ public class MongoNodeStoreService{
private ServiceRegistration reg;
private final List<Registration> registrations = new ArrayList<Registration>();
- private MongoMK mk;
+ private DocumentMK mk;
private ObserverTracker observerTracker;
private BundleContext bundleContext;
@@ -128,7 +128,7 @@ public class MongoNodeStoreService{
MongoClient client = new MongoClient(mongoURI);
DB mongoDB = client.getDB(db);
- mk = new MongoMK.Builder()
+ mk = new DocumentMK.Builder()
.memoryCacheSize(cacheSize * MB)
.offHeapCacheSize(offHeapCache * MB)
.setMongoDB(mongoDB)
@@ -144,7 +144,7 @@ public class MongoNodeStoreService{
store = kns;
observerTracker = new ObserverTracker(kns);
} else {
- MongoNodeStore mns = mk.getNodeStore();
+ DocumentNodeStore mns = mk.getNodeStore();
store = mns;
observerTracker = new ObserverTracker(mns);
}
@@ -187,7 +187,7 @@ public class MongoNodeStoreService{
}
}
- private void registerJMXBeans(MongoMK mk, BundleContext context) {
+ private void registerJMXBeans(DocumentMK mk, BundleContext context) {
Whiteboard wb = new OsgiWhiteboard(context);
registrations.add(
registerMBean(wb,
Propchange: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentPropertyState.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoPropertyState.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentPropertyState.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentPropertyState.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoPropertyState.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoPropertyState.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentPropertyState.java Tue Jan 28 11:28:23 2014
@@ -44,9 +44,9 @@ import static org.apache.jackrabbit.oak.
/**
* PropertyState implementation with lazy parsing of the JSOP encoded value.
*/
-final class MongoPropertyState implements PropertyState {
+final class DocumentPropertyState implements PropertyState {
- private final MongoNodeStore store;
+ private final DocumentNodeStore store;
private final String name;
@@ -54,7 +54,7 @@ final class MongoPropertyState implement
private PropertyState parsed = null;
- MongoPropertyState(MongoNodeStore store, String name, String value) {
+ DocumentPropertyState(DocumentNodeStore store, String name, String value) {
this.store = store;
this.name = name;
this.value = value;
@@ -109,8 +109,8 @@ final class MongoPropertyState implement
public boolean equals(Object object) {
if (this == object) {
return true;
- } else if (object instanceof MongoPropertyState) {
- MongoPropertyState other = (MongoPropertyState) object;
+ } else if (object instanceof DocumentPropertyState) {
+ DocumentPropertyState other = (DocumentPropertyState) object;
return this.name.equals(other.name)
&& this.value.equals(other.value);
}
@@ -165,7 +165,7 @@ final class MongoPropertyState implement
* @param reader the reader
* @return new property state
*/
- static PropertyState readProperty(String name, MongoNodeStore store, JsopReader reader) {
+ static PropertyState readProperty(String name, DocumentNodeStore store, JsopReader reader) {
if (reader.matches(JsopReader.NUMBER)) {
String number = reader.getToken();
try {
@@ -223,7 +223,7 @@ final class MongoPropertyState implement
* @param reader the reader
* @return new property state
*/
- static PropertyState readArrayProperty(String name, MongoNodeStore store, JsopReader reader) {
+ static PropertyState readArrayProperty(String name, DocumentNodeStore store, JsopReader reader) {
int type = PropertyType.STRING;
List<Object> values = Lists.newArrayList();
while (!reader.matches(']')) {
Propchange: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentPropertyState.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentPropertyState.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoRootBuilder.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoRootBuilder.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MongoRootBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java Tue Jan 28 11:28:23 2014
@@ -35,7 +35,7 @@ import org.apache.jackrabbit.oak.spi.sta
* This implementation tracks the number of pending changes and purges them to
* a private branch of the underlying store if a certain threshold is met.
*/
-class MongoRootBuilder extends MemoryNodeBuilder {
+class DocumentRootBuilder extends MemoryNodeBuilder {
/**
* Number of content updates that need to happen before the updates
@@ -46,7 +46,7 @@ class MongoRootBuilder extends MemoryNod
/**
* The underlying store
*/
- protected final MongoNodeStore store;
+ protected final DocumentNodeStore store;
/**
* The base state of this builder, possibly non-existent if this builder
@@ -60,14 +60,14 @@ class MongoRootBuilder extends MemoryNod
/**
* Private branch used to hold pending changes exceeding {@link #UPDATE_LIMIT}
*/
- private MongoNodeStoreBranch branch;
+ private DocumentNodeStoreBranch branch;
/**
* Number of updated not yet persisted to the private {@link #branch}
*/
private int updates;
- MongoRootBuilder(MongoNodeState base, MongoNodeStore store) {
+ DocumentRootBuilder(DocumentNodeState base, DocumentNodeStore store) {
super(checkNotNull(base));
this.store = checkNotNull(store);
this.base = base;
@@ -89,8 +89,8 @@ class MongoRootBuilder extends MemoryNod
}
@Override
- protected MongoNodeBuilder createChildBuilder(String name) {
- return new MongoNodeBuilder(this, name, this);
+ protected DocumentNodeBuilder createChildBuilder(String name) {
+ return new DocumentNodeBuilder(this, name, this);
}
@Override
Propchange: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MergeCommit.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MergeCommit.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MergeCommit.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MergeCommit.java Tue Jan 28 11:28:23 2014
@@ -26,7 +26,7 @@ class MergeCommit extends Commit {
private final SortedSet<Revision> mergeRevs;
- MergeCommit(MongoNodeStore nodeStore,
+ MergeCommit(DocumentNodeStore nodeStore,
Revision baseRevision,
SortedSet<Revision> revisions) {
super(nodeStore, baseRevision, revisions.last());
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionContext.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionContext.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionContext.java Tue Jan 28 11:28:23 2014
@@ -24,7 +24,7 @@ import java.util.Comparator;
public interface RevisionContext {
/**
- * @return the branches of the local MongoMK instance, which are not yet
+ * @return the branches of the local DocumentMK instance, which are not yet
* merged.
*/
UnmergedBranches getBranches();
@@ -40,7 +40,7 @@ public interface RevisionContext {
Comparator<Revision> getRevisionComparator();
/**
- * @return the cluster id of the local MongoMK instance.
+ * @return the cluster id of the local DocumentMK instance.
*/
int getClusterId();
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnmergedBranches.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnmergedBranches.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnmergedBranches.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnmergedBranches.java Tue Jan 28 11:28:23 2014
@@ -33,7 +33,7 @@ import javax.annotation.Nonnull;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
/**
- * <code>UnmergedBranches</code> contains all un-merged branches of a MongoMK
+ * <code>UnmergedBranches</code> contains all un-merged branches of a DocumentMK
* instance.
*/
class UnmergedBranches {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocOffHeapCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocOffHeapCache.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocOffHeapCache.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocOffHeapCache.java Tue Jan 28 11:28:23 2014
@@ -51,7 +51,7 @@ import org.apache.jackrabbit.oak.cache.C
import org.apache.jackrabbit.oak.cache.CacheValue;
import org.apache.jackrabbit.oak.plugins.document.CachedNodeDocument;
import org.apache.jackrabbit.oak.plugins.document.DocumentStore;
-import org.apache.jackrabbit.oak.plugins.document.MongoMK;
+import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -75,7 +75,7 @@ public class NodeDocOffHeapCache
public NodeDocOffHeapCache(Cache<String, NodeDocument> delegate,
ForwardingListener<String, NodeDocument> forwardingListener,
- MongoMK.Builder builder,
+ DocumentMK.Builder builder,
DocumentStore documentStore) {
super(delegate);
forwardingListener.setDelegate(new PrimaryRemovalListener());
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java Tue Jan 28 11:28:23 2014
@@ -41,7 +41,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.Document;
import org.apache.jackrabbit.oak.plugins.document.DocumentStore;
-import org.apache.jackrabbit.oak.plugins.document.MongoMK;
+import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
import org.apache.jackrabbit.oak.plugins.document.Revision;
import org.apache.jackrabbit.oak.plugins.document.RevisionEntry;
@@ -108,7 +108,7 @@ public class MongoDocumentStore implemen
private String lastReadWriteMode;
- public MongoDocumentStore(DB db, MongoMK.Builder builder) {
+ public MongoDocumentStore(DB db, DocumentMK.Builder builder) {
nodes = db.getCollection(
Collection.NODES.toString());
clusterNodes = db.getCollection(
@@ -134,7 +134,7 @@ public class MongoDocumentStore implemen
builder.getDocumentCacheSize());
}
- private Cache<String , NodeDocument> createOffHeapCache(MongoMK.Builder builder){
+ private Cache<String , NodeDocument> createOffHeapCache(DocumentMK.Builder builder){
ForwardingListener<String , NodeDocument> listener = ForwardingListener.newInstance();
Cache<String,NodeDocument> primaryCache = CacheBuilder.newBuilder()
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java Tue Jan 28 11:28:23 2014
@@ -83,7 +83,7 @@ public class MongoConnection {
*/
public static MongoClientOptions.Builder getDefaultBuilder() {
return new MongoClientOptions.Builder()
- .description("MongoConnection for Oak MongoMK")
+ .description("MongoConnection for Oak DocumentMK")
.threadsAllowedToBlockForConnectionMultiplier(100);
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixture.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixture.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixture.java Tue Jan 28 11:28:23 2014
@@ -25,8 +25,8 @@ import java.io.IOException;
import org.apache.jackrabbit.mk.core.MicroKernelImpl;
import org.apache.jackrabbit.oak.kernel.KernelNodeStore;
-import org.apache.jackrabbit.oak.plugins.document.MongoMK;
-import org.apache.jackrabbit.oak.plugins.document.MongoNodeStore;
+import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
+import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
@@ -55,12 +55,12 @@ public abstract class NodeStoreFixture {
public static final NodeStoreFixture MONGO_MK = new NodeStoreFixture() {
@Override
public String toString() {
- return "MongoMK Fixture";
+ return "DocumentMK Fixture";
}
@Override
public NodeStore createNodeStore() {
- return new CloseableNodeStore(new MongoMK.Builder().open());
+ return new CloseableNodeStore(new DocumentMK.Builder().open());
}
@Override
@@ -83,13 +83,13 @@ public abstract class NodeStoreFixture {
@Override
public NodeStore createNodeStore() {
- return new MongoMK.Builder().getNodeStore();
+ return new DocumentMK.Builder().getNodeStore();
}
@Override
public void dispose(NodeStore nodeStore) {
- if (nodeStore instanceof MongoNodeStore) {
- ((MongoNodeStore) nodeStore).dispose();
+ if (nodeStore instanceof DocumentNodeStore) {
+ ((DocumentNodeStore) nodeStore).dispose();
}
}
};
@@ -117,9 +117,9 @@ public abstract class NodeStoreFixture {
private static class CloseableNodeStore
extends KernelNodeStore implements Closeable {
- private final MongoMK kernel;
+ private final DocumentMK kernel;
- public CloseableNodeStore(MongoMK kernel) {
+ public CloseableNodeStore(DocumentMK kernel) {
super(kernel, DEFAULT_CACHE_SIZE);
this.kernel = kernel;
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/LargeMoveTestIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/LargeMoveTestIT.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/LargeMoveTestIT.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/LargeMoveTestIT.java Tue Jan 28 11:28:23 2014
@@ -46,7 +46,7 @@ public class LargeMoveTestIT extends Oak
@Before
public void setUp() throws CommitFailedException {
- // FIXME slow on MongoMK and MongoNS. See OAK-964
+ // FIXME slow on DocumentMK and MongoNS. See OAK-964
assumeTrue(fixture != NodeStoreFixture.MONGO_MK
&& fixture != NodeStoreFixture.MONGO_NS);
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMongoConnectionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMongoConnectionTest.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMongoConnectionTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMongoConnectionTest.java Tue Jan 28 11:28:23 2014
@@ -28,10 +28,10 @@ import org.junit.BeforeClass;
* to a clean test database. Tests in subclasses are automatically
* skipped if the configured MongoDB connection can not be created.
*/
-public abstract class AbstractMongoConnectionTest extends MongoMKTestBase {
+public abstract class AbstractMongoConnectionTest extends DocumentMKTestBase {
protected MongoConnection mongoConnection;
- protected MongoMK mk;
+ protected DocumentMK mk;
@BeforeClass
public static void checkMongoDbAvailable() {
@@ -42,7 +42,7 @@ public abstract class AbstractMongoConne
public void setUpConnection() throws Exception {
mongoConnection = MongoUtils.getConnection();
MongoUtils.dropCollections(mongoConnection.getDB());
- mk = new MongoMK.Builder().setMongoDB(mongoConnection.getDB()).open();
+ mk = new DocumentMK.Builder().setMongoDB(mongoConnection.getDB()).open();
}
@After
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BackgroundWriteTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BackgroundWriteTest.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BackgroundWriteTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BackgroundWriteTest.java Tue Jan 28 11:28:23 2014
@@ -25,17 +25,17 @@ import org.junit.Test;
import static org.junit.Assert.assertTrue;
/**
- * Tests related to background write operation in MongoNodeStore.
+ * Tests related to background write operation in DocumentNodeStore.
*/
public class BackgroundWriteTest {
@Test // OAK-1190
public void limitMultiUpdate() {
- MongoMK mk = new MongoMK.Builder().setDocumentStore(
+ DocumentMK mk = new DocumentMK.Builder().setDocumentStore(
new TestStore()).setAsyncDelay(0).open();
List<String> paths = new ArrayList<String>();
StringBuilder sb = new StringBuilder();
- for (int i = 0; paths.size() < MongoNodeStore.BACKGROUND_MULTI_UPDATE_LIMIT * 2; i++) {
+ for (int i = 0; paths.size() < DocumentNodeStore.BACKGROUND_MULTI_UPDATE_LIMIT * 2; i++) {
String child = "node-" + i;
sb.append("+\"").append(child).append("\":{}");
for (int j = 0; j < 1000; j++) {
@@ -61,7 +61,7 @@ public class BackgroundWriteTest {
public <T extends Document> void update(Collection<T> collection,
List<String> keys,
UpdateOp updateOp) {
- assertTrue(keys.size() <= MongoNodeStore.BACKGROUND_MULTI_UPDATE_LIMIT);
+ assertTrue(keys.size() <= DocumentNodeStore.BACKGROUND_MULTI_UPDATE_LIMIT);
super.update(collection, keys, updateOp);
}
}
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BaseDocumentMKTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BaseMongoMKTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BaseDocumentMKTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BaseDocumentMKTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BaseMongoMKTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BaseMongoMKTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BaseDocumentMKTest.java Tue Jan 28 11:28:23 2014
@@ -21,15 +21,15 @@ import org.junit.After;
import org.junit.Before;
/**
- * <code>BaseMongoMKTest</code>...
+ * <code>BaseDocumentMKTest</code>...
*/
-public class BaseMongoMKTest extends MongoMKTestBase {
+public class BaseDocumentMKTest extends DocumentMKTestBase {
- protected MongoMK mk;
+ protected DocumentMK mk;
@Before
- public void initMongoMK() {
- mk = new MongoMK.Builder().open();
+ public void initDocumentMK() {
+ mk = new DocumentMK.Builder().open();
}
@Override
@@ -38,7 +38,7 @@ public class BaseMongoMKTest extends Mon
}
@After
- public void disposeMongoMK() {
+ public void disposeDocumentMK() {
if (mk != null) {
mk.dispose();
mk = null;
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BaseDocumentMKTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BaseDocumentMKTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobReferenceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobReferenceTest.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobReferenceTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobReferenceTest.java Tue Jan 28 11:28:23 2014
@@ -36,7 +36,7 @@ public class BlobReferenceTest {
@Test
public void test() throws Exception {
- MongoNodeStore s = new MongoMK.Builder().getNodeStore();
+ DocumentNodeStore s = new DocumentMK.Builder().getNodeStore();
NodeBuilder a = s.getRoot().builder();
HashSet<String> set = new HashSet<String>();
for (int i = 0; i < 100; i++) {
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobTest.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobTest.java Tue Jan 28 11:28:23 2014
@@ -54,7 +54,7 @@ public class BlobTest {
@Test
public void addBlobs() throws Exception {
- MongoMK mk = new MongoMK.Builder().
+ DocumentMK mk = new DocumentMK.Builder().
setMongoDB(openMongoConnection()).open();
long blobSize = TOTAL_SIZE / DOCUMENT_COUNT;
ArrayList<String> blobIds = new ArrayList<String>();